admin/milvus
1
0
Fork 0
mirror of https://gitee.com/milvus-io/milvus.git synced 2026-01-01 00:15:30 +08:00
Code Issues Packages Projects Releases Wiki Activity
1,853 Commits 138 Branches 188 Tags
Commit Graph

914 Commits

Author SHA1 Message Date
jinhai
3e4d98f04a Merge branch 'branch-0.4.0' into 'branch-0.4.0' 
MS-348 Add ResourceFactory Test

See merge request megasearch/milvus!343

Former-commit-id: c55c49518e73e46616d706fb9cb582dcef883d61
 2019-08-13 20:29:24 +08:00
wxyu
a0c52e3730 MS-348 Add ResourceFactory Test 
Former-commit-id: 2b8519881eb88c532b0a02f7f515f345545cd55c
 2019-08-13 20:18:21 +08:00
peng.xu
331535c89f Merge branch 'branch-0.4.0' into 'branch-0.4.0' 
clean code

See merge request megasearch/milvus!342

Former-commit-id: f68abd3aeb74d796fc4d6ac000b7e61921fce2d8
 2019-08-13 18:51:35 +08:00
peng.xu
d7d41d5b58 Merge branch 'fix_MS-303' into 'branch-0.4.0' 
fix MS-303

Closes MS-303

See merge request megasearch/milvus!341

Former-commit-id: 43aca5c912195fd7628ea467849bcd5fe95bd839
 2019-08-13 18:51:23 +08:00
starlord
dacd86f0af clean code 
Former-commit-id: 81fdba0f5bc4e523f47b4f4f7fecac1fc5abdd62
 2019-08-13 18:50:36 +08:00
xj.lin
eb3f9aa6a5 fix 
Former-commit-id: 7bb0559f007ef32b8331be8d4947ebe7595714b3
 2019-08-13 18:49:46 +08:00
peng.xu
cb67c47874 Merge branch 'branch-0.4.0' into 'branch-0.4.0' 
MS-346 add .cpp to solve compile error

See merge request megasearch/milvus!340

Former-commit-id: 5d6f9b817c695f04019ccc2b70122f63117e4d2e
 2019-08-13 17:56:56 +08:00
wxyu
7b83d2a62f MS-346 add .cpp to solve compile error 
Former-commit-id: 3db400a1bd346ca72e591fbd6b3557387f435b0c
 2019-08-13 17:55:12 +08:00
jinhai
09801053e9 Merge branch 'branch-0.4.0' into 'branch-0.4.0' 
MS-345 Add Node Test

See merge request megasearch/milvus!338

Former-commit-id: d13ce00f0b0ca8f59b01034e447c1a0419d65bc0
 2019-08-13 17:52:37 +08:00
Yu Kun
dcf8d3e838 Merge remote-tracking branch 'upstream/branch-0.4.0' into branch-0.4.0 
Former-commit-id: 5bdebcd74b5a5d7665029f727ac452807d7f564f
 2019-08-13 17:29:17 +08:00
Yu Kun
bb9b6d36fd rename milvus_grpc_server to milvus_server 
Former-commit-id: 54f295751d413a3af3765ff6334d25392ed17ac8
 2019-08-13 17:29:13 +08:00
wxyu
46a184f1e3 Merge remote-tracking branch 'main/branch-0.4.0' into branch-0.4.0 
Former-commit-id: 567d2b89bf0e202d39bcf81c9b1e8121dea254e4
 2019-08-13 16:45:55 +08:00
wxyu
741035b408 MS-345 Add Node Test 
Former-commit-id: 71877f19888587a8ede17babdd332e852f587731
 2019-08-13 16:45:39 +08:00
starlord
039b38bc71 avoid jenkins break build 
Former-commit-id: b326a6ae14befd2f5dad11076cc4299edc55d341
 2019-08-13 16:37:22 +08:00
Yu Kun
18f82c0676 merge upstream/branch-0.4.0 
Former-commit-id: 6f30324f85ed3f86c359a96b6877affff52a75c0
 2019-08-13 15:42:41 +08:00
Yu Kun
1a06e7e944 Merge remote-tracking branch 'upstream/branch-0.4.0' into branch-0.4.0 
Former-commit-id: 41b7d12779189baff1a90aaf749c4a8f138e1584
 2019-08-13 15:37:27 +08:00
Yu Kun
4ba11c02d4 add new interface definition 
Former-commit-id: 1f5919bfd2b3a08422c408922733e40edd9c5db2
 2019-08-13 15:37:16 +08:00
starlord
3e47b26d9f MS-343 implement ResourceMgr 
Former-commit-id: f0f04297bb219cfa20e4eba609ff390f84e3a4a3
 2019-08-13 15:28:27 +08:00
starlord
549b18f871 MS-343 implement ResourceMgr 
Former-commit-id: 4cafc2cadf229ab61952233f1abc04d4ffdf9129
 2019-08-13 15:22:01 +08:00
wxyu
d551a1a3e7 MS-336 scheduler interface 
Former-commit-id: 407e0af036d417a22e6002906773344fb6559818
 2019-08-13 11:24:04 +08:00
jinhai
e7c202b79c Merge branch 'branch-0.3.1' into branch-0.4.0 
Former-commit-id: 0158e842f89d68cb712a3a19cda55678a47256ff
 2019-08-12 15:01:17 +08:00
starlord
039a268f22 MS-330 Stability test failed caused by server core dumped 
Former-commit-id: 6399857193109ff8d5886c9b8db168cda04026bb
 2019-08-12 14:06:08 +08:00
Yu Kun
f8b7df5e0b modify build.sh to make thrift on 
Former-commit-id: b38a915b34149df47de5be0611970490dd2751aa
 2019-08-09 18:24:01 +08:00
starlord
414be9021d MS-330 Stability test failed caused by server core dumped 
Former-commit-id: 66079f9b51b0e40adfc6dfbcf2d2156431124ebb
 2019-08-09 18:19:07 +08:00
Yu Kun
ebd8cd9aeb merge upstream and fix bug 
Former-commit-id: 45fa6852c3ad2303263cc836d30f3d2f76dd964f
 2019-08-09 17:00:32 +08:00
Yu Kun
a68fa43ddd grpc and thrift server run concurrently 
Former-commit-id: 4abfccaf6ee598bbb7cc47d48f943b8ca9726f12
 2019-08-09 15:46:32 +08:00
starlord
ce7e835658 handle exception in merge file 
Former-commit-id: 0b1503599944acafa30e12642c3e00c915afc223
 2019-08-09 15:34:11 +08:00
Yu Kun
41f723b18f Merge branch 'branch-0.4.0' of 192.168.1.105:kun.yu/milvus into branch-0.4.0 
Former-commit-id: 6a44b05f060f493f8b769f7e0edf243cf30c4aee
 2019-08-08 16:50:21 +08:00
Yu Kun
5707abd092 add knowhere 
Former-commit-id: 009352f91536d366e3559f19614ced91f8be01e0
 2019-08-08 16:32:17 +08:00
jinhai
6e04bf9ef2 Merge branch 'branch-0.4.0' into 'branch-0.4.0' 
MS-313: add GRPC

See merge request megasearch/milvus!311

Former-commit-id: d488459184731d5c12599d1ecd5f3774b747ae69
 2019-08-08 15:56:51 +08:00
Yu Kun
275cea60ff fix functions define format 
Former-commit-id: 6f3af9f43c08b03827462a3d7cd0da047baf24c8
 2019-08-08 15:52:20 +08:00
jinhai
72b51497ad Merge branch 'branch-0.4.0' into 'branch-0.4.0' 
Branch 0.4.0

See merge request megasearch/milvus!317

Former-commit-id: d9ac08c2928ff02954e263c1b63a5256b816e68f
 2019-08-08 15:52:02 +08:00
starlord
39499d2f77 MS-327 clean code 
Former-commit-id: 46b960c0a67766c4d67b36826ec88b47ae470206
 2019-08-08 15:36:00 +08:00
jinhai
9620a673fe Merge branch 'branch-0.3.1' into branch-0.4.0 
Former-commit-id: d3f1d181c97f95d9bee881adb0ff9be20aa0d951
 2019-08-08 15:11:34 +08:00
Yu Kun
179a0feabf modify format 
Former-commit-id: 74f43325a1b8ae17b1b7a5aeb61f0c6d7fd42de4
 2019-08-08 15:02:27 +08:00
starlord
1d04dba7bb Merge remote-tracking branch 'source/branch-0.4.0' into branch-0.4.0 
Former-commit-id: cc366ea4feff59d555ddf80b70b8c77f049b8709
 2019-08-08 14:42:14 +08:00
starlord
3f699e1757 MS-328 Check metric type on server start 
Former-commit-id: 736c87b1731618461082b7171ffb366396a1dbd2
 2019-08-08 14:29:07 +08:00
starlord
4d5618f4c3 MS-327 clean code 
Former-commit-id: 9ca0ea6cb89b3fb95e17b0c0d6f647fe0c3ff7c4
 2019-08-08 14:20:00 +08:00
Yu Kun
dd48f79662 Merge remote-tracking branch 'upstream/branch-0.4.0' into branch-0.4.0 
Former-commit-id: 7bca577f8a3afe88301417dddfe4e1e66711b2d4
 2019-08-08 11:01:17 +08:00
starlord
3056efda01 MS-312 Set openmp thread number by config 
Former-commit-id: 511a0da7d85a341c0970f2e5823152b5ae2c71db
 2019-08-08 10:37:01 +08:00
starlord
b82fa58a98 fix build error 
Former-commit-id: 2304715789a9bc684e88cdd666b679c7803fb043
 2019-08-08 10:26:16 +08:00
kun yu
01a30b2ea6 merge upstream/branch-0.4.0 
Former-commit-id: db495b0e7f256b98485986281fe83edf8beb6970
 2019-08-07 20:23:39 +08:00
kun yu
88998999f1 cannot use make_shared 
Former-commit-id: dd213f89cdac4b36734a18078c1712872c8d8e84
 2019-08-07 19:52:39 +08:00
kun yu
128b25e90a modify with comments 
Former-commit-id: 9da07f5bcfcd872c2f9328bf1a5dae3b16553ed9
 2019-08-07 19:12:56 +08:00
jinhai
79ea7ecbec Merge branch 'branch-0.3.1' into branch-0.4.0 
Former-commit-id: b479db2044d96bd9cd84e3ed6d5a33c8df2442a6
 2019-08-07 17:30:16 +08:00
starlord
29d7913485 MS-324 Show error when there is not enough gpu memory to build index 
Former-commit-id: f0dff85efafe0a74629bfc766c05387e37e8a743
 2019-08-07 17:27:31 +08:00
zhiru.zhu
a1811deabf Update MySQLConnectionPool.cpp 
Former-commit-id: 4b21d79885c0e28a24aceb266683e983174735cc
 2019-08-06 19:36:42 +08:00
zhiru
5b8f62c229 Merge remote-tracking branch 'upstream/branch-0.4.0' into branch-0.4.0 
Former-commit-id: b2343181af61af6f369bae7cd747ade0378d8087
 2019-08-06 18:07:45 +08:00
zhiru
81928c91e4 cmake: add grpc 
Former-commit-id: 3a17c401ed59ff071040c6e67a6e7c76a315d958
 2019-08-06 18:04:37 +08:00
starlord
1b0dd8ee90 MS-312 Set openmp thread number by config 
Former-commit-id: 7ddafa3aa22d0455b343d07cc37b1a30d1ac29a1
 2019-08-06 17:42:35 +08:00