admin/milvus
1
0
Fork 0
mirror of https://gitee.com/milvus-io/milvus.git synced 2025-12-30 07:25:37 +08:00
Code Issues Packages Projects Releases Wiki Activity
2,472 Commits 136 Branches 186 Tags
Commit Graph

1285 Commits

Author SHA1 Message Date
jinhai
73ee2e0a7b Update lockguard 
Former-commit-id: 1bdcd84679433929e582689661730f1359077c98
 2019-09-12 17:58:18 +08:00
jinhai
8c9bbc4467 Fix compile error 
Former-commit-id: 2fb38500e2c534d1ddfeca123675c2f425efb2a4
 2019-09-12 09:29:09 +00:00
jinhai
bf9e1d7073 Merge branch 'branch-1.4.0' of http://192.168.1.105:6060/jinhai/milvus into branch-0.4.0 
Former-commit-id: aa587bd63672ba5bec583eba3f4737142af02f0d
 2019-09-12 09:13:18 +00:00
jinhai
ca53a98c55 Add merge mutex 
Former-commit-id: 3e65e9a3195ec1eff635b17997b599dbca1a0457
 2019-09-12 17:11:02 +08:00
peng.xu
da99a9e1f0 Merge branch 'branch-0.4.0' into 'branch-0.4.0' 
fix build index error

See merge request megasearch/milvus!562

Former-commit-id: 3f42a54ffa04c2f8c53ff6228e982fac8281b4fd
 2019-09-12 16:23:44 +08:00
starlord
193d0eeb6d fix build index error 
Former-commit-id: 593aeb2482792bfef55fbec8e6480df498cf9708
 2019-09-12 16:22:21 +08:00
jinhai
221a3134a1 Merge branch 'ms549' into 'branch-0.4.0' 
MS-549 server crash when search and train on same gpu

See merge request megasearch/milvus!561

Former-commit-id: 949cd52836c801888f352fef96d7cff2022a9ca1
 2019-09-12 15:48:26 +08:00
yudong.cai
25a78bb9b1 MS-543 send error status to sdk when load index fail 
Former-commit-id: eee5d755dc706d176a0d0a29db17ba29ebb6aa37
 2019-09-12 15:42:46 +08:00
xj.lin
c9aff1ebab MS-549 server crash when search and train on same gpu 
Former-commit-id: b285b816dac478e3940a5dac38bd45c7b13da578
 2019-09-12 15:33:46 +08:00
yudong.cai
f136df4aaa MS-543 send error status to sdk when load index fail 
Former-commit-id: a62922b904c7f7d478f5211b4d215d387ea23ae2
 2019-09-12 14:10:56 +08:00
peng.xu
cb332598d9 Merge branch 'branch-0.4.0' into 'branch-0.4.0' 
MS-546 Add simple mode resource_config

See merge request megasearch/milvus!558

Former-commit-id: 79f3420f07aedde4897c718498cc3ec7d1be463b
 2019-09-12 12:05:27 +08:00
wxyu
c569f8acf5 solve conflicts 
Former-commit-id: 9d12c13ad3b65384e6f566f83655b0d85028312f
 2019-09-12 12:04:47 +08:00
Yu Kun
4223ad9dc2 fix searchinfiles return status bug 
Former-commit-id: f7d2490eb6eebf366d4130e5b48adcaab6e41020
 2019-09-12 11:56:37 +08:00
wxyu
54ec2a126d MS-546 Add simple mode resource_config 
Former-commit-id: d1909071f0d5e630ae8919c473083cad04778d76
 2019-09-12 11:48:45 +08:00
Yu Kun
ddfc052223 Merge remote-tracking branch 'upstream/branch-0.4.0' into branch-0.4.0 
Former-commit-id: 1086979d1883a172a96f99ad5d6d03aa6b61e3f1
 2019-09-12 11:30:55 +08:00
peng.xu
9998adb305 Merge branch 'branch-0.4.0' into 'branch-0.4.0' 
remove gpu_cache_capacity config

See merge request megasearch/milvus!555

Former-commit-id: 684259254218b9c02a3fdaa67ffadd3dca7efc0e
 2019-09-12 11:30:25 +08:00
starlord
b92d489709 remove gpu_cache_capacity config 
Former-commit-id: 34cd12b8f13d4d92517cd6c5aa94fa8aa0c1cd66
 2019-09-12 11:25:21 +08:00
Yu Kun
d6c314b9e6 fix conflicts 
Former-commit-id: aa97e1f8864d9cf3c48c41b3670a0f315019350c
 2019-09-12 11:18:11 +08:00
Yu Kun
a2504c13e3 fix coverage bugs 
Former-commit-id: 6fd2ca73cc082164c2e44301797cbade85fbe218
 2019-09-12 11:15:02 +08:00
jinhai
26c8011294 Change type 
Former-commit-id: da3ae3ff25ac26dd1c85a52bd8ddc5538dd42fbd
 2019-09-12 10:51:56 +08:00
jinhai
457c43a9f4 Merge remote-tracking branch 'upstream/branch-0.4.0' into branch-0.4.0 
Former-commit-id: 316fb37455523a04270b87ba49824a4ef3352abe
 2019-09-12 10:31:31 +08:00
Yu Kun
4cd641058f remove some nouse changes 
Former-commit-id: c550390a97917b975fe456a733efda7d5b17c099
 2019-09-11 21:26:35 +08:00
Yu Kun
6625cc1a81 Merge remote-tracking branch 'upstream/branch-0.4.0' into branch-0.4.0 
Former-commit-id: e59c248d2b525fe480a3b5ba97c6acc6e63d0c45
 2019-09-11 20:42:01 +08:00
Yu Kun
cc0ce2e49f MS-532 Add grpc server unittest 
Former-commit-id: 92368a067cc2a7295f3fd027b576f78789297b52
 2019-09-11 20:17:43 +08:00
xj.lin
12dd738e46 MS-544 fix 
Former-commit-id: 2d9d4afb74ce2522b8cf5bf29ade982d3d6722ad
 2019-09-11 20:16:31 +08:00
Yu Kun
6afd997b7a Merge remote-tracking branch 'upstream/branch-0.4.0' into branch-0.4.0 
Former-commit-id: d918f411479abd408d66ae84741ffb5231ccce42
 2019-09-11 19:08:35 +08:00
peng.xu
aee725a3f2 Merge branch 'branch-0.4.0' into 'branch-0.4.0' 
update config validation

See merge request megasearch/milvus!551

Former-commit-id: 87c1e2b4f6c66b2fe9c89990bf2209bacd7b91ae
 2019-09-11 18:52:10 +08:00
zhiru
127fb43bf7 update config validation 
Former-commit-id: a0e644700e6c3ce9e443da782019dae276fd4b36
 2019-09-11 18:49:55 +08:00
peng.xu
a8e971ce3a Merge branch 'branch-0.4.0' into 'branch-0.4.0' 
optimize debug log

See merge request megasearch/milvus!550

Former-commit-id: 242a51f50863d23ffdb0a53dd0ca8bbb99e8fb30
 2019-09-11 18:31:36 +08:00
yudong.cai
47d98989d0 optimize debug log 
Former-commit-id: cf7c5b41a51493072acf68f42649cca532a4d896
 2019-09-11 18:28:22 +08:00
starlord
28cc9e459e refine code 
Former-commit-id: 1d9e51080453544da5a6032a87618ef944bf3594
 2019-09-11 18:01:44 +08:00
Yu Kun
789c6f9e4f Merge remote-tracking branch 'upstream/branch-0.4.0' into branch-0.4.0 
Former-commit-id: c5e7ad8a644fb1bec6ee528e5c5723e3f14f0b04
 2019-09-11 17:19:32 +08:00
starlord
1982736a86 refine unittest code 
Former-commit-id: 71662b7d99de6fcbbe80b98b82cc704ae3cc9398
 2019-09-11 11:37:19 +08:00
starlord
9d8f88febd refine config 
Former-commit-id: cffe2a35f6ea8aa2bdcd409825b97980b91c217f
 2019-09-11 11:14:51 +08:00
Yu Kun
57aa611988 Merge remote-tracking branch 'upstream/branch-0.4.0' into branch-0.4.0 
Former-commit-id: 578f5ac9752a682c8079a7e3e298d32d90cd39a3
 2019-09-11 11:02:34 +08:00
Heisenberg
395e234daf Merge branch 'branch-0.4.0' into add_unitest 
Former-commit-id: c2f38de4a83f3fd9b94f451f3cf1f201ee1c60b9
 2019-09-11 10:36:36 +08:00
Heisenberg
d804bed0f5 add unit test 
Former-commit-id: 7807128ae39dd66c812fa254be840d2c4c7a364e
 2019-09-11 10:36:09 +08:00
Yu Kun
c98c46d3f0 Merge remote-tracking branch 'upstream/branch-0.4.0' into branch-0.4.0 
Former-commit-id: a5c66e27fb41eff47fe0725fd14029a983f3ab62
 2019-09-10 21:00:03 +08:00
Yu Kun
c5cb0a835d MS-532 Add grpc server unittest 
Former-commit-id: 18af543a28ac54c150f11135c88016311e34251b
 2019-09-10 20:59:45 +08:00
jinhai
5c8225adfd Merge branch 'ms311' into 'branch-0.4.0' 
MS-311 1. error log remove compile address

See merge request megasearch/milvus!543

Former-commit-id: 21094596ab39654d5f3ba9ac460bfc3e6dbece8e
 2019-09-10 20:16:06 +08:00
xj.lin
5ca56a1718 MS-311 1. error log remove compile address 
Former-commit-id: ff24292efc9765678f880362edffe180d8fb8192
 2019-09-10 20:14:58 +08:00
jinhai
cbd07c18f8 Merge branch 'branch-0.4.0' into 'branch-0.4.0' 
update mysql meta test

See merge request megasearch/milvus!541

Former-commit-id: 18d9bbf13cb2f23fc75bb3142f5c21bab9c7d3e4
 2019-09-10 19:44:51 +08:00
zhiru
c811c3a781 update mysql meta test 
Former-commit-id: 5f6d059f81b16ae34354324c16f342c3125c8b92
 2019-09-10 19:42:18 +08:00
wxyu
93297ffe5d Merge remote-tracking branch 'main/branch-0.4.0' into branch-0.4.0 
Former-commit-id: c2a42f8e0cd12ca351c024638c41d56e4f0f22b3
 2019-09-10 19:31:45 +08:00
wxyu
ded3355538 MS-539 Remove old task code 
Former-commit-id: 89d66627b558cb33e5b482520e256b701e5d7868
 2019-09-10 19:31:29 +08:00
jinhai
941e4dc83c Merge branch 'update_unittest' into 'branch-0.4.0' 
MS-538 1. update kdt unittest

See merge request megasearch/milvus!539

Former-commit-id: eca8fb73f491f73ddc2775a26d0b03db9dc92fe2
 2019-09-10 19:12:58 +08:00
xj.lin
deb90c2c98 MS-538 1. update kdt unittest 
Former-commit-id: a1239af4df964ebae18e4d34f778593c2e982945
 2019-09-10 19:09:51 +08:00
Heisenberg
4e28185484 merge the newest code 
Former-commit-id: 69be61b7715976b4852881717743e2dc121fbf49
 2019-09-10 18:40:34 +08:00
Heisenberg
13d040d88a fix the merge conflict again 
Former-commit-id: 3a5d6fbd3eef5164abea957353e41bcb2661a08e
 2019-09-10 18:38:50 +08:00
yudong.cai
65d20ae3d8 MS-507 fix performance issue when set CPU_CACHE to 16 or 64 
Former-commit-id: 402b5d91a9866c38bc7dd16be1fa22de5a0b6bf8
 2019-09-10 18:35:32 +08:00