Commit Graph

1855 Commits

Author SHA1 Message Date
peng.xu
2e50a88f11 Merge branch 'branch-0.4.0' into 'branch-0.4.0'
default grpc

See merge request megasearch/milvus!344

Former-commit-id: 726e8e5f3041f11933b4c096e839065ca4627940
2019-08-14 10:18:33 +08:00
starlord
ac56710cb7 default grpc
Former-commit-id: 0e0421331684f7a44ccffa3fc24f6960d7d1114c
2019-08-14 10:14:23 +08:00
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
peng.xu
ae88adeee7 Merge branch 'branch-0.4.0' into 'branch-0.4.0'
rename milvus_grpc_server to milvus_server

See merge request megasearch/milvus!339

Former-commit-id: ad8fc2817951dafcb4d54fba7f601042022185f0
2019-08-13 17:39:40 +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
peng.xu
8b1b54f098 Merge branch 'branch-0.4.0' into 'branch-0.4.0'
MS-344 Add TaskTable Test

See merge request megasearch/milvus!334

Former-commit-id: 94dfae6b58e54bca27b36af35f09ee15dd0d75ec
2019-08-13 16:42:50 +08:00
peng.xu
04d0e061ac Merge branch 'branch-0.4.0' into 'branch-0.4.0'
avoid jenkins break build

See merge request megasearch/milvus!337

Former-commit-id: afef7e472190161eec83b01811e7623a63f7ce90
2019-08-13 16:38:26 +08:00
starlord
039b38bc71 avoid jenkins break build
Former-commit-id: b326a6ae14befd2f5dad11076cc4299edc55d341
2019-08-13 16:37:22 +08:00
peng.xu
251d03ee7f Merge branch 'branch-0.4.0' into 'branch-0.4.0'
add new interface definition and move milvus_server to milvus_grpc_server

See merge request megasearch/milvus!335

Former-commit-id: a12a9f9805b81d3828699c5e69433deaa160d02d
2019-08-13 15:53:03 +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
wxyu
065b8d4911 MS-344 Add TaskTable Test
Former-commit-id: 9607e4bbde87ae231dfedfc8e63ea78599675aa0
2019-08-13 15:37:13 +08:00
peng.xu
e16eacc32d Merge branch 'branch-0.4.0' into 'branch-0.4.0'
MS-343 Implement ResourceMgr

See merge request megasearch/milvus!333

Former-commit-id: e1e40a51bdac6faa4c085d2c347ac668c64b16fb
2019-08-13 15:34:28 +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
jinhai
9556eb21bf Merge branch 'branch-0.4.0' into 'branch-0.4.0'
MS-336 scheduler interface

See merge request megasearch/milvus!332

Former-commit-id: 2545eaae1eb2f49d7d6765e4fa93c236986342af
2019-08-13 11:27:39 +08:00
wxyu
6efc7398cc MS-336 scheduler interface
Former-commit-id: 3c66c2027cfad489d7bf7cde2a6a577cd92dc8a3
2019-08-13 11:26:21 +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
jinhai
2b00d2c947 Merge branch 'branch-0.3.1' into 'branch-0.3.1'
MS-330 Stability test failed caused by server core dumped

See merge request megasearch/milvus!331

Former-commit-id: 6bc84abf296104fa0d75f451f7dc4da4f781d540
2019-08-12 15:00:00 +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
jinhai
91f3c9a991 Merge branch 'branch-0.4.0' into 'branch-0.4.0'
modify build.sh to make thrift on

See merge request megasearch/milvus!330

Former-commit-id: 956f04cd563d9c46a464d7703fcae73eb4e0e315
2019-08-09 18:30:04 +08:00
Yu Kun
f8b7df5e0b modify build.sh to make thrift on
Former-commit-id: b38a915b34149df47de5be0611970490dd2751aa
2019-08-09 18:24:01 +08:00
jinhai
305158b1da Merge branch 'branch-0.3.1' into 'branch-0.3.1'
MS-330 Stability test failed caused by server core dumped

See merge request megasearch/milvus!329

Former-commit-id: 17dd6b71947de56b0fe72ff57c73b5dab9676084
2019-08-09 18:23:21 +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
Jeff
adf3cb5747 Merge branch 'branch-0.4.0' into 'branch-0.4.0'
update build.sh

See merge request megasearch/milvus!328

Former-commit-id: 52fe092b7914e3ce8f7f01af8d9377e68ed00b03
2019-08-09 18:14:24 +08:00
quicksilver
aeae907d6d update build.sh
Former-commit-id: ec1488d6e4fecc756349dd88b056dda24b181b9a
2019-08-09 18:13:47 +08:00
jinhai
e79d239552 Merge branch 'branch-0.4.0' into 'branch-0.4.0'
grpc and thrift server run concurrently

See merge request megasearch/milvus!327

Former-commit-id: 505108b219e5bdf2c74a65d5bf7ec069daea2aba
2019-08-09 17:04:00 +08:00
Yu Kun
643a85999d modify start_server.sh
Former-commit-id: 0a020148bf0e9a22fc833f9d197fba63c7cc2377
2019-08-09 17:01:55 +08:00
Yu Kun
ebd8cd9aeb merge upstream and fix bug
Former-commit-id: 45fa6852c3ad2303263cc836d30f3d2f76dd964f
2019-08-09 17:00:32 +08:00
Yu Kun
db7513070a Merge remote-tracking branch 'upstream/branch-0.4.0' into branch-0.4.0
Former-commit-id: 2fc7b24448d516f5caf048b8a9840378a3548cfb
2019-08-09 15:46:53 +08:00
Yu Kun
a68fa43ddd grpc and thrift server run concurrently
Former-commit-id: 4abfccaf6ee598bbb7cc47d48f943b8ca9726f12
2019-08-09 15:46:32 +08:00
jinhai
6833926354 Merge branch 'branch-0.3.1' into 'branch-0.3.1'
handle exception in merge file

See merge request megasearch/milvus!326

Former-commit-id: e89886cc0b784e73baaeebf3a6c57ba8bd788150
2019-08-09 15:35:31 +08:00
starlord
ce7e835658 handle exception in merge file
Former-commit-id: 0b1503599944acafa30e12642c3e00c915afc223
2019-08-09 15:34:11 +08:00
Jeff
241f365a4b Merge branch 'branch-0.4.0' into 'branch-0.4.0'
MS-306 - Optimize build efficiency

See merge request megasearch/milvus!325

Former-commit-id: 73462ede77ba19fe979e28b553f628918670ee8a
2019-08-09 10:56:59 +08:00
quicksilver
096845036b update grpc md5
Former-commit-id: 57821ab629fb4e144d2be216ce3d9cc0875afe56
2019-08-09 10:56:15 +08:00
Jeff
01ffd6f7e4 Merge branch 'branch-0.4.0' into 'branch-0.4.0'
MS-306 - Optimize build efficiency

See merge request megasearch/milvus!324

Former-commit-id: 33a942178603bfb53bf74762d7a96729f495181d
2019-08-09 10:23:03 +08:00
quicksilver
f50fa28ce8 add grpc cache
Former-commit-id: bd68cc1dcd7521f0daf66630fd00bf97d2145efe
2019-08-09 10:21:58 +08:00