starlord
12bb81c5b4
refine code
...
Former-commit-id: d878f03aeb45f3a78d1e7676de4645e6fe4469f0
2019-09-05 11:13:22 +08:00
Yu Kun
e8429a19ec
fix conflicts
...
Former-commit-id: 91a7705ab4b0d359e3044e40ffb34f1ab650011d
2019-09-05 10:53:45 +08:00
Yu Kun
0fb029eec9
MS-482 Change search stream transport to unary in grpc
...
Former-commit-id: d2230e4dbe24d3e4176cf1d8b256e8b7b68f91b4
2019-09-05 10:51:46 +08:00
starlord
a30a638d13
Merge remote-tracking branch 'source/branch-0.4.0' into branch-0.4.0
...
Former-commit-id: d4c83bacbbdeee3c95ddfee4542e56cbc27aa248
2019-09-05 10:48:15 +08:00
jinhai
62775f4964
Merge branch 'update_gpuresource' into 'branch-0.4.0'
...
MS-476 1. default value
See merge request megasearch/milvus!482
Former-commit-id: d5bd3ac23fe8eacb867c676bdd91ddec7c3fb26b
2019-09-05 10:38:33 +08:00
xj.lin
ea0443c84e
MS-476 1. default value
...
Former-commit-id: 57341d845d864f22604890004af28708f9fffea9
2019-09-05 10:37:12 +08:00
jinhai
4c5f7ea8af
Merge branch 'update_gpuresource' into 'branch-0.4.0'
...
MS-476 1. fix resource mgr config
See merge request megasearch/milvus!481
Former-commit-id: 7742d4b3e8fa8d4059bbbedb95a152f3f2f68acd
2019-09-05 10:33:27 +08:00
xj.lin
b24882563d
MS-476 1. enable default value
...
Former-commit-id: 1692514a0749b7fdaaf66679c07903398efd3b7e
2019-09-05 10:32:17 +08:00
starlord
c118d15fa2
Merge remote-tracking branch 'source/branch-0.4.0' into branch-0.4.0
...
Former-commit-id: d1768235b11458b3199b5b7beaa0836d4d7f791b
2019-09-05 10:32:09 +08:00
starlord
e441dea5cb
refine code
...
Former-commit-id: b873ea2628269323db8230c6c82081cfbefc79b2
2019-09-05 10:32:07 +08:00
xj.lin
ee303a525a
MS-476 1. fix resource mgr config
...
Former-commit-id: 3914417a5fa92e5fe59868e3a0ccb0885fea7f9d
2019-09-04 20:43:26 +08:00
jinhai
1e3965a5aa
Merge branch 'new_gpureource' into 'branch-0.4.0'
...
MS-476 improve gpu performance
See merge request megasearch/milvus!479
Former-commit-id: 5711daa911c2c6c090593b5eaf0ac0514b213d38
2019-09-04 19:24:09 +08:00
peng.xu
2bfec26ce0
Merge branch 'branch-0.4.0' into 'branch-0.4.0'
...
MS-458 fix bug for keep building index for one file when no gpu resource
See merge request megasearch/milvus!480
Former-commit-id: 6454851f6ccedf216e827105a51306af5e430c3f
2019-09-04 17:23:04 +08:00
yudong.cai
ece4f16289
MS-458 fix bug for keep building index for one file when no gpu resource
...
Former-commit-id: 3fbf5481c3fa9660e6a1baf26958cb9e6a7cbba7
2019-09-04 17:19:19 +08:00
xj.lin
35492ec0f9
MS-476 1. add resource mgr config
...
Former-commit-id: 5cae0ea977e93184ad34de39983ef46cb1ab075b
2019-09-04 17:11:25 +08:00
xj.lin
d97f1bd723
Merge branch 'branch-0.4.0' into new_gpureource
...
Former-commit-id: 559676452dbcf72cb2a3f195c5233ee45bc97ef3
2019-09-04 16:51:03 +08:00
xj.lin
1b4a908510
MS-476 1. update gpuresource mgr 2. improve gpu index performance
...
Former-commit-id: 0659a3ded3c00befbddc991b3017e76cfca0070d
2019-09-04 16:49:41 +08:00
peng.xu
7a718f4773
Merge branch 'branch-0.4.0' into 'branch-0.4.0'
...
remove boring log
See merge request megasearch/milvus!478
Former-commit-id: 06fed23eb403bb908fb1f01b8945159bc63b9523
2019-09-04 16:33:05 +08:00
starlord
b136286c53
remove boring log
...
Former-commit-id: 2be0fd0de169ff85565e578833e00659ca3cd319
2019-09-04 16:32:22 +08:00
peng.xu
7b5482290a
Merge branch 'branch-0.4.0' into 'branch-0.4.0'
...
MS-471 code coverage run failed
See merge request megasearch/milvus!477
Former-commit-id: 2d61f481c77acd95be9a9ffc71712ac89fc2e0ac
2019-09-04 15:02:58 +08:00
starlord
1e06f5301e
Merge remote-tracking branch 'source/branch-0.4.0' into branch-0.4.0
...
Former-commit-id: 68f01cc8899a4eec24aca874d890420db5216177
2019-09-04 15:02:10 +08:00
jinhai
f4aea7dbc2
MS-471 code coverage run failed
...
Former-commit-id: a1623ef97423b1ed4086c70b5fb8965efac25580
2019-09-04 15:01:04 +08:00
jinhai
6afa9b887c
Merge branch 'branch-0.4.0' into 'branch-0.4.0'
...
MS-471 code coverage run failed
See merge request megasearch/milvus!476
Former-commit-id: a2589b3767efcb909f825b22246bcf97e8f265eb
2019-09-04 14:39:42 +08:00
starlord
8d7480314e
MS-471 code coverage run failed
...
Former-commit-id: 9aea558d811b52f9e8349567a3746c3b89b683db
2019-09-04 14:29:46 +08:00
jinhai
a1bf3d44ce
Merge branch 'fixBug' into 'branch-0.4.0'
...
MS-467: temp revert
See merge request megasearch/milvus!475
Former-commit-id: 8c9c098a5315b97817f070562070058c36a809d2
2019-09-04 11:19:02 +08:00
zhiru
89a2918881
temp revert
...
Former-commit-id: afde77cd234773c595196d95efbb34ad93ca39ff
2019-09-04 11:17:51 +08:00
starlord
6376caae03
Merge remote-tracking branch 'source/branch-0.4.0' into branch-0.4.0
...
Former-commit-id: 60a150ae5fa752e083ceb53e4492ae425f38ffb7
2019-09-03 17:10:08 +08:00
jinhai
79a861ed21
Merge branch 'fixBug' into 'branch-0.4.0'
...
MS-467: fix mysql db test bug
See merge request megasearch/milvus!474
Former-commit-id: 393ee7e7bae6fc0f77d3b0b732cd74ee07faf9a8
2019-09-03 17:06:00 +08:00
jinhai
e940d3c4b0
Merge branch 'branch-0.4.0' into 'branch-0.4.0'
...
refine code
See merge request megasearch/milvus!473
Former-commit-id: 9cf729c16944ec29956944a88b4578fd9795b6c9
2019-09-03 17:05:56 +08:00
starlord
1619acb517
Merge remote-tracking branch 'source/branch-0.4.0' into branch-0.4.0
...
Former-commit-id: fb9720bc8bae865778e337335db1cfbad37209a4
2019-09-03 17:00:16 +08:00
zhiru
e22d86d069
fix mysql db test bug
...
Former-commit-id: 517ac31e54b412259295db51f3b4c7ad42445f13
2019-09-03 16:32:00 +08:00
starlord
0399c2b57e
refine code
...
Former-commit-id: cc73d87afb3ce7671f4103c06553562d63eaaf17
2019-09-03 15:24:01 +08:00
zhiru
1e604eca31
Merge remote-tracking branch 'upstream/branch-0.4.0' into cmake
...
Former-commit-id: 1fbc82b1370cc90d03fac5bee1d1cbec006f7c6d
2019-09-03 14:40:26 +08:00
jinhai
a9b5ec7ca2
Merge branch 'branch-0.4.0' into 'branch-0.4.0'
...
fix unittest failure
See merge request megasearch/milvus!472
Former-commit-id: 1c56ddd3262644d69227b75b253d74f070e597ca
2019-09-03 13:56:51 +08:00
starlord
4452de4990
fix unittest failure
...
Former-commit-id: 9707d5d7550b9db72b4bbdd5c71f6e68febdb36d
2019-09-03 12:39:24 +08:00
xj.lin
f307e8dd86
add knowhere error message
...
Former-commit-id: 2c20ca16ad79f359ecfcf858211f40a289f90376
2019-09-03 11:45:06 +08:00
jinhai
2e594177cc
Merge branch 'branch-0.4.0' into 'branch-0.4.0'
...
MS-463 Search timeout
See merge request megasearch/milvus!471
Former-commit-id: 54cf3521d710116cc87525d434c0f7c6962abe41
2019-09-03 11:27:33 +08:00
Yu Kun
83ab8a3406
MS-463 Search timeout
...
Former-commit-id: 7fc8d310d4335f972e995dcf8009aef0854779a5
2019-09-03 11:26:44 +08:00
Yu Kun
926d474887
MS-463 Search timeout
...
Former-commit-id: 35dad8989759e24fe749bb0429f72e911eb16aa0
2019-09-03 11:26:12 +08:00
zhiru
ff79e1796e
cmake: integerated knowhere
...
Former-commit-id: bd87ac66e3bc90a85a4fb6517711c4a2c36caaef
2019-09-03 10:18:55 +08:00
jinhai
1030b27379
Merge branch 'enable_knowhere_test' into 'branch-0.4.0'
...
Enable knowhere test
See merge request megasearch/milvus!470
Former-commit-id: d4579d8670e8a3eb3d220850c3ab856e25ca8c72
2019-09-03 10:07:39 +08:00
xj.lin
0dc0df6bac
Merge branch 'branch-0.4.0' into enable_knowhere_test
...
Former-commit-id: 2eece5caff6b83319bcab406ed91da85f21acb9f
2019-09-03 10:00:23 +08:00
xj.lin
36359554e4
MS-442 enable knowhere wrapper test
...
Former-commit-id: 6912138096ccc0966999edd6b9b199d7f2092202
2019-09-03 09:59:28 +08:00
jinhai
d3cc563862
Merge branch 'branch-0.4.0' into 'branch-0.4.0'
...
MS-462 - Run milvus server twices, should display error
See merge request megasearch/milvus!469
Former-commit-id: 359cb7028ef8296841ce9a943ea1422b408208f0
2019-09-02 20:31:49 +08:00
Yu Kun
d67a6bce46
merge conflict
...
Former-commit-id: 19b757b6692fb5a397b85f6188e8772790e04f37
2019-09-02 20:29:57 +08:00
Yu Kun
5857d8163e
MS-462 Run milvus server twices, should display error
...
Former-commit-id: 5d9e7b62470cf48ba84d7be358b0f277268fa831
2019-09-02 20:28:01 +08:00
jinhai
b85785674d
Merge branch 'branch-0.4.0' into 'branch-0.4.0'
...
MS-461 Mysql meta unittest failed
See merge request megasearch/milvus!468
Former-commit-id: d9c105ca5fc1d045867b365eb94030c33368a8d1
2019-09-02 20:11:39 +08:00
starlord
35276039a1
MS-461 Mysql meta unittest failed
...
Former-commit-id: 347d9c7f7181474175ff107b01da30074afb97c4
2019-09-02 20:10:51 +08:00
Yu Kun
abb1979f0c
change gpu_id type in config
...
Former-commit-id: 794d6af83b269a1cca1850cb7efd53387509113a
2019-09-02 19:23:20 +08:00
Yu Kun
63c4777924
add PushTaskToNeighbourRandomlyTest
...
Former-commit-id: e0617c1042a30dddd73838e0d87524a4eaff1293
2019-09-02 17:39:45 +08:00