2725 Commits

Author SHA1 Message Date
xiaojun.lin
04524d9c0e hybrid enable
Former-commit-id: 9c89d56f61445c1b1eda80b1403165aba2d3b986
2019-10-09 17:58:59 +08:00
xiaojun.lin
5807d62db0 add hybrid mode
Former-commit-id: feae4c8df728c1ae8f96e2d19c0b115a5a420575
2019-10-09 17:57:49 +08:00
JinHai-CN
2eeee72f40 MS-613 Integrate new faiss
Former-commit-id: 40982d3b5f39debbd8964274481930b07ba55020
2019-10-08 17:40:54 +08:00
JinHai-CN
0c05edfddb MS-595 Fix compiling error on gcc 7.4
Former-commit-id: 4f602467afe2e6e859c3d7772a6136a6ee5d0fcf
2019-10-06 14:46:03 +08:00
jinhai
81c37afc40 Merge branch 'refactor_knowhere' into 'branch-0.5.0'
MS-565 Refactor knowhere

See merge request megasearch/milvus!632

Former-commit-id: bc42aef029e853c270141d5a5727fed0c4f624fe
2019-09-27 16:12:05 +08:00
jinhai
4d72034f16 Merge branch 'branch-0.5.0' into 'branch-0.5.0'
MS-574 update config comments

See merge request megasearch/milvus!631

Former-commit-id: dc99628c293285c5037d0d3e58e5d4ebe949e538
2019-09-27 16:09:34 +08:00
yudong.cai
f64380aed2 MS-574 update config comments
Former-commit-id: d9b088a15e16c43be8eae1657184d30ade8e3053
2019-09-27 16:08:14 +08:00
jinhai
0b7d3487f6 Merge branch 'branch-0.5.0' into 'branch-0.5.0'
MS-595 Fix compiling error on gcc 7.4

See merge request megasearch/milvus!630

Former-commit-id: 0a29043919a3f1f014bd36046eee1b4c39a2f076
2019-09-27 15:52:15 +08:00
JinHai-CN
88ced5a751 MS-595 Fix compiling error on gcc 7.4
Former-commit-id: 2d408646efb2d8bbc48803a8d39be8570751778e
2019-09-27 15:51:48 +08:00
xiaojun.lin
2652b3bcc4 Merge branch 'branch-0.5.0' into refactor_knowhere
Former-commit-id: 981b23f103df4dfdd5c4bcb571b2aad2d973de03
2019-09-27 15:50:04 +08:00
xiaojun.lin
180600fb24 MS-565 remove jsoncons v2
Former-commit-id: a37cbd9b67c66fca6e4ef08519e5f48248985c98
2019-09-27 15:41:20 +08:00
peng.xu
7268cfb351 Merge branch 'branch-0.5.0' into 'branch-0.5.0'
format metric code

See merge request megasearch/milvus!629

Former-commit-id: b3a568226c079750930027bfb617063736ed0cfd
2019-09-27 15:13:23 +08:00
starlord
ca1ab56cb4 format metric code
Former-commit-id: ea430e044ae3c93b051c4ac6261cfe3c241ae80b
2019-09-27 15:12:08 +08:00
peng.xu
f84607833b Merge branch 'branch-0.5.0' into 'branch-0.5.0'
remove MetricBase.h from code coverage check

See merge request megasearch/milvus!628

Former-commit-id: b58503ea4a8af6a90cfc88df11b83a4cc7e4e4d7
2019-09-27 15:00:38 +08:00
yudong.cai
45a5d644d5 remove MetricBase.h from code coverage check
Former-commit-id: a13611379840983ac4b2ea9573a353485d4a9ac6
2019-09-27 14:46:15 +08:00
peng.xu
b046049ffd Merge branch 'branch-0.5.0' into 'branch-0.5.0'
format scheduler code

See merge request megasearch/milvus!627

Former-commit-id: 4b46d2b89a1309faa30580dbcf58111c13c68ae5
2019-09-27 14:22:23 +08:00
starlord
a0e4d19e4f format db code
Former-commit-id: 3b4781e4c000beea41baddf54635d7bbe7ea5f52
2019-09-27 14:13:33 +08:00
starlord
6ed49d1dd0 Merge remote-tracking branch 'source/branch-0.5.0' into branch-0.5.0
Former-commit-id: f1c33b228f904ee3976f81712da9945260d79f0b
2019-09-27 11:50:08 +08:00
starlord
965ca2c9c1 format scheduler code
Former-commit-id: c2ff1ac702af62b4968a192d12b258bc90dd0b50
2019-09-27 11:50:01 +08:00
peng.xu
d4babb6dde Merge branch 'branch-0.5.0' into 'branch-0.5.0'
MS-574 add API ResetDefaultConfig()

See merge request megasearch/milvus!626

Former-commit-id: 118e04f2cf6967582c4f959bad67257ab648c6be
2019-09-27 11:26:56 +08:00
yudong.cai
85d3c9d052 MS-574 add API ResetDefaultConfig()
Former-commit-id: 475b048bb6386ffd3bb09a229694e954f8fc67e7
2019-09-27 11:25:13 +08:00
peng.xu
104f47a4ff Merge branch 'branch-0.5.0' into 'branch-0.5.0'
format code

See merge request megasearch/milvus!625

Former-commit-id: dddc1624ff602429646b348f15e645e8b17624bd
2019-09-27 11:24:18 +08:00
starlord
a4f1a6392f format sdk code
Former-commit-id: be186a4338c2921bd22bae6091e6f145f20ccc46
2019-09-27 11:13:26 +08:00
starlord
92bb4d26e4 Merge remote-tracking branch 'source/branch-0.5.0' into branch-0.5.0
Former-commit-id: b272a86b888eee87fa36a232f0ce298c4e754ab9
2019-09-27 11:10:27 +08:00
peng.xu
c8f4366225 Merge branch 'branch-0.5.0' into 'branch-0.5.0'
MS-574 update config unittest

See merge request megasearch/milvus!624

Former-commit-id: 5d035110fac8b66873d0014035017cd0733e15e5
2019-09-27 10:39:50 +08:00
yudong.cai
3a6448b3e8 MS-574 update config unittest
Former-commit-id: f60c3ada442acea12827bcae136a29adbe6f9c2e
2019-09-27 10:37:07 +08:00
starlord
4645535217 format cache code
Former-commit-id: 99ff6affb78c09941a59c53183427a14b8ff00d1
2019-09-27 10:09:09 +08:00
jinhai
6ac9c1a0c0 Merge branch 'branch-0.5.0' into 'branch-0.5.0'
format utils code

See merge request megasearch/milvus!623

Former-commit-id: 3c2551066c29720fad91520ed2edfa0c872dff1c
2019-09-26 20:39:38 +08:00
starlord
5585aaff4e Merge branch 'branch-0.5.0' of 192.168.1.105:groot/vecwise_engine into branch-0.5.0
Former-commit-id: e94e95e51b4d977b1529a2a04e9598eb2ea625bb
2019-09-26 20:37:05 +08:00
starlord
2a2a070c95 fix build error
Former-commit-id: 9b595c80931e17acf676f03e1f3b4cdcc9a40b94
2019-09-26 20:36:58 +08:00
starlord
5b0a13bf07 fix build error
Former-commit-id: 3416c37d548be2e04dc2814830d935baab5104cb
2019-09-26 20:34:31 +08:00
starlord
2b132a9cef format server code
Former-commit-id: 5502293863810d216a6c8c46a28eb76bfa30bd12
2019-09-26 20:25:57 +08:00
starlord
3d51d69555 format utils code
Former-commit-id: aa281f8473100587c93afe7caf001ce640fbcc2d
2019-09-26 19:58:25 +08:00
peng.xu
20f7bc3395 Merge branch 'branch-0.5.0' into 'branch-0.5.0'
Branch 0.5.0

See merge request megasearch/milvus!622

Former-commit-id: 84feb749a1405471c5f7421e5582df3140dbd613
2019-09-26 19:13:51 +08:00
starlord
27e7850bdf format code
Former-commit-id: b60db90436cc9d8de9fd86d721ffb48d3041da73
2019-09-26 19:13:12 +08:00
peng.xu
ff644703bb Merge branch 'branch-0.5.0' into 'branch-0.5.0'
MS-574 Milvus configuration refactor

See merge request megasearch/milvus!621

Former-commit-id: c489f31e297ce57d3bfe995ce734bb0da546d972
2019-09-26 19:08:36 +08:00
yudong.cai
d9b6fd0575 MS-574 rename config deploy_mode
Former-commit-id: b3f2c2cc539c3cd7419c091b6eaf17df0a57f0eb
2019-09-26 19:05:09 +08:00
starlord
d5a825edfd format config code
Former-commit-id: 6d87e0d669e5f8029453a94cc1817372263ff30f
2019-09-26 18:59:01 +08:00
peng.xu
fb9b13d0b8 Merge branch 'branch-0.5.0' into 'branch-0.5.0'
format wrapper code

See merge request megasearch/milvus!620

Former-commit-id: e78e3a82f0d34a9d949f1c25a9fac0a622a38ed6
2019-09-26 18:54:48 +08:00
starlord
4c91d328b1 format wrapper code
Former-commit-id: 04af0f6d6e66d1fdcd01fc8de0cf93000793d5db
2019-09-26 18:53:50 +08:00
yudong.cai
d0b888c012 MS-574 refine configuration names
Former-commit-id: c8f29009c5dc6712a0fd67185e24d4f9ce1286d1
2019-09-26 18:49:32 +08:00
peng.xu
4b10cb3ec0 Merge branch 'branch-0.5.0' into 'branch-0.5.0'
MS-587 Count get wrong result after adding vectors and index built immediately

See merge request megasearch/milvus!619

Former-commit-id: b086ba967fc165e4f6d7ee2c5e57d933ccb8a2ee
2019-09-26 17:13:03 +08:00
starlord
073a987d79 MS-587 Count get wrong result after adding vectors and index built immediately
Former-commit-id: 8e46b545f10a230f1f74c9529c23aabf2af56b40
2019-09-26 17:08:18 +08:00
xiaojun.lin
aff9491824 Merge branch 'branch-0.5.0' into refactor_knowhere
Former-commit-id: 005c77538d7c2d0b52015a748a04da6d171d0f3d
2019-09-26 17:05:07 +08:00
xiaojun.lin
d78d032b82 MS-565 remove jsoncons v1
Former-commit-id: cedf253075a00eb4a7d999ffcceb90f8fa795f2e
2019-09-26 17:03:46 +08:00
peng.xu
33c169be8c Merge branch 'branch-0.5.0' into 'branch-0.5.0'
MS-592 Change showtables stream transport to unary

See merge request megasearch/milvus!618

Former-commit-id: 15d98768d614ce07d85c44b40dc7cef88b685034
2019-09-26 15:16:29 +08:00
peng.xu
4fe32aedc9 Merge branch 'branch-0.5.0' into 'branch-0.5.0'
fix ci issue

See merge request megasearch/milvus!617

Former-commit-id: 89a78e5c4bf3abb4ec2efba0b7d65dea72126462
2019-09-26 15:13:15 +08:00
starlord
9e4e60f570 fix ci issue
Former-commit-id: 02a03f10641926de5f466449d738700fb22652ed
2019-09-26 15:12:23 +08:00
Yu Kun
3ed012660a fix conflicts
Former-commit-id: b76eb04b7a5490d6ac28024f0367580b4fbb7e8a
2019-09-26 15:11:48 +08:00
Yu Kun
5e0e22385c MS-592 Change showtables stream transport to unary
Former-commit-id: b5746069867c3c647a00623f0e36b01c7fc4eb19
2019-09-26 15:01:42 +08:00