d8e6fca466
Merge branch 'branch-0.4.0' into 'branch-0.4.0'
...
MS-482 Change search stream transport to unary in grpc
See merge request megasearch/milvus!488
Former-commit-id: e7d576cf58f2154658fbdc1813ea76b42e31ee03
2019-09-05 17:23:32 +08:00
5e037e420f
MS-470 Drop index success, which table not created
...
Former-commit-id: 8ec6d5e60b2095d418446324530ca8e5a84ba8ba
2019-09-05 16:42:33 +08:00
f90b57d195
revert in searchtask
...
Former-commit-id: 364a871624ad5a664f8aa9fad2c2006b0388f03d
2019-09-05 16:36:07 +08:00
53aac70ad9
fix conflicts
...
Former-commit-id: d9f9e5bcccd2f7e8691471403051f245d8ea4f41
2019-09-05 16:31:48 +08:00
92aedc55b9
fix conflicts
...
Former-commit-id: e91a1292e4b65a509f1f1a749d2aac66d8d0d748
2019-09-05 15:55:49 +08:00
d2af21f03f
Merge branch 'branch-0.4.0' into update_gpuresource
...
Former-commit-id: bce35930a0548fc4df5e7d68f3947d868efe8d19
2019-09-05 15:35:44 +08:00
636b4d7914
MS-484 1. remove idmap add search config
...
Former-commit-id: f698807bbc0a3011f1c3327d596aed2bd0a627ea
2019-09-05 15:35:11 +08:00
1139157e41
Merge remote-tracking branch 'upstream/branch-0.4.0' into branch-0.4.0
...
Former-commit-id: 301aebcf3f7733b74b0e18d42060ea1328e347b0
2019-09-05 14:09:29 +08:00
dc9ca49874
fix conflicts
...
Former-commit-id: 117e31f7cfff33e1b5716e60e4521faa0ef4ecee
2019-09-05 14:09:19 +08:00
2522b04294
Merge branch 'update_gpuresource' into 'branch-0.4.0'
...
MS-484 1. update faiss version 2. idmap add search config
See merge request megasearch/milvus!485
Former-commit-id: b821c0cc0075c3f0ff6a293b37488daf79c29258
2019-09-05 12:00:39 +08:00
6b422840b4
MS-484 1. update faiss version 2. idmap add search config
...
Former-commit-id: e9b2131870e0a011a94c6cd2fed8166d9ebd80a5
2019-09-05 11:59:24 +08:00
c4536f0d74
fix conflicts
...
Former-commit-id: d23695bdff018e5c94e92286307c6dc52df8ee93
2019-09-05 11:31:00 +08:00
3f6c9ce766
Merge remote-tracking branch 'upstream/branch-0.4.0' into branch-0.4.0
...
Former-commit-id: 38cbc16947b3d4d3fabf871a531209fcf8f4ceff
2019-09-05 11:21:34 +08:00
2fbad4e43f
fix conflicts
...
Former-commit-id: 1e15db53dc0af40678969cd1111458582c055223
2019-09-05 11:21:18 +08:00
5986de3f8a
Merge branch 'branch-0.4.0' into 'branch-0.4.0'
...
refine code
See merge request megasearch/milvus!483
Former-commit-id: 5323139fbe9f0e080d6287754651ef285cb461a9
2019-09-05 11:15:49 +08:00
12bb81c5b4
refine code
...
Former-commit-id: d878f03aeb45f3a78d1e7676de4645e6fe4469f0
2019-09-05 11:13:22 +08:00
e8429a19ec
fix conflicts
...
Former-commit-id: 91a7705ab4b0d359e3044e40ffb34f1ab650011d
2019-09-05 10:53:45 +08:00
0fb029eec9
MS-482 Change search stream transport to unary in grpc
...
Former-commit-id: d2230e4dbe24d3e4176cf1d8b256e8b7b68f91b4
2019-09-05 10:51:46 +08:00
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
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
ea0443c84e
MS-476 1. default value
...
Former-commit-id: 57341d845d864f22604890004af28708f9fffea9
2019-09-05 10:37:12 +08:00
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
b24882563d
MS-476 1. enable default value
...
Former-commit-id: 1692514a0749b7fdaaf66679c07903398efd3b7e
2019-09-05 10:32:17 +08:00
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
e441dea5cb
refine code
...
Former-commit-id: b873ea2628269323db8230c6c82081cfbefc79b2
2019-09-05 10:32:07 +08:00
ee303a525a
MS-476 1. fix resource mgr config
...
Former-commit-id: 3914417a5fa92e5fe59868e3a0ccb0885fea7f9d
2019-09-04 20:43:26 +08:00
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
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
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
35492ec0f9
MS-476 1. add resource mgr config
...
Former-commit-id: 5cae0ea977e93184ad34de39983ef46cb1ab075b
2019-09-04 17:11:25 +08:00
d97f1bd723
Merge branch 'branch-0.4.0' into new_gpureource
...
Former-commit-id: 559676452dbcf72cb2a3f195c5233ee45bc97ef3
2019-09-04 16:51:03 +08:00
1b4a908510
MS-476 1. update gpuresource mgr 2. improve gpu index performance
...
Former-commit-id: 0659a3ded3c00befbddc991b3017e76cfca0070d
2019-09-04 16:49:41 +08:00
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
b136286c53
remove boring log
...
Former-commit-id: 2be0fd0de169ff85565e578833e00659ca3cd319
2019-09-04 16:32:22 +08:00
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
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
f4aea7dbc2
MS-471 code coverage run failed
...
Former-commit-id: a1623ef97423b1ed4086c70b5fb8965efac25580
2019-09-04 15:01:04 +08:00
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
8d7480314e
MS-471 code coverage run failed
...
Former-commit-id: 9aea558d811b52f9e8349567a3746c3b89b683db
2019-09-04 14:29:46 +08:00
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
89a2918881
temp revert
...
Former-commit-id: afde77cd234773c595196d95efbb34ad93ca39ff
2019-09-04 11:17:51 +08:00
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
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
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
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
e22d86d069
fix mysql db test bug
...
Former-commit-id: 517ac31e54b412259295db51f3b4c7ad42445f13
2019-09-03 16:32:00 +08:00
0399c2b57e
refine code
...
Former-commit-id: cc73d87afb3ce7671f4103c06553562d63eaaf17
2019-09-03 15:24:01 +08:00
1e604eca31
Merge remote-tracking branch 'upstream/branch-0.4.0' into cmake
...
Former-commit-id: 1fbc82b1370cc90d03fac5bee1d1cbec006f7c6d
2019-09-03 14:40:26 +08:00
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
4452de4990
fix unittest failure
...
Former-commit-id: 9707d5d7550b9db72b4bbdd5c71f6e68febdb36d
2019-09-03 12:39:24 +08:00
peng.xu
zirui.chen
Yu Kun
xj.lin
jinhai
starlord
yudong.cai
zhiru