1770 Commits

Author SHA1 Message Date
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
9583b9da64 Merge remote-tracking branch 'upstream/branch-0.4.0' into branch-0.4.0
Former-commit-id: 3a06caa572c2732c4e9da3e5b10cd18900225fc1
2019-09-12 11:57:22 +08:00
Yu Kun
4223ad9dc2 fix searchinfiles return status bug
Former-commit-id: f7d2490eb6eebf366d4130e5b48adcaab6e41020
2019-09-12 11:56:37 +08:00
wxyu
0f6a6fe14d MS-546 Add simple mode resource_config
Former-commit-id: 13c594c3db06dc998af041ccb85d78d92a5e8fbf
2019-09-12 11:49:32 +08:00
wxyu
54ec2a126d MS-546 Add simple mode resource_config
Former-commit-id: d1909071f0d5e630ae8919c473083cad04778d76
2019-09-12 11:48:45 +08:00
starlord
012d1df09f Merge remote-tracking branch 'source/branch-0.4.0' into branch-0.4.0
Former-commit-id: 50170cbe70ef0111ab5c81a8472e5fee5a1ec708
2019-09-12 11:39:55 +08:00
Yu Kun
8c06e4e2e3 remove some nouse changes
Former-commit-id: 9b09de4cdb409f5327db7ce8966b0974eed1d3fa
2019-09-12 11:35:15 +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
Yu Kun
9f832656a0 fix conflicts
Former-commit-id: 5bf67736ef9c4a6dc505899a2bf5cb289c3c5aa5
2019-09-12 11:28:20 +08:00
starlord
d95417f793 Merge remote-tracking branch 'source/branch-0.4.0' into branch-0.4.0
Former-commit-id: 82145d3269bdda9f17993aa75c2308faf949c74c
2019-09-12 11:27:32 +08:00
starlord
a7ea9b2817 remove gpu_cache_capacity config
Former-commit-id: 94abdd662201c9b19c79d7b7170f3e9af2c39e81
2019-09-12 11:27:19 +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
6c90546ee5 fix search status return error
Former-commit-id: f44e97911d38a7aec383ba15d649699ff3b8328f
2019-09-11 20:41:36 +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
Yu Kun
7eb3a6b6a3 MS-532 Add grpc server unittest
Former-commit-id: c5fe1f0a5efdface4aaca2e178553c9481991770
2019-09-11 17:19:25 +08:00
starlord
a67c928eb3 avoid unittest failure
Former-commit-id: a079455ff123d9121dd1032500564be08e237857
2019-09-11 14:02:55 +08:00
starlord
74d6d518bd refine unittest code
Former-commit-id: 07d66baee30ad9ab130ca3cbc75ca50adcb68865
2019-09-11 11:53:28 +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
Yu Kun
ca61c45f09 MS-532 Add grpc server unittest
Former-commit-id: 031714ba8543429be0862e5878a20cdfdbb3981c
2019-09-11 11:02:29 +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
peng.xu
805b5c29f6 Merge branch 'branch-0.4.0' into 'branch-0.4.0'
fix unitest failure

See merge request megasearch/milvus!545

Former-commit-id: d8e09e13ad3995df18aabc470438b127712e87c9
2019-09-11 10:32:04 +08:00
starlord
563baa52e8 fix unitest failure
Former-commit-id: 8582ebb9772270e41e74e4c582044e6e8b732d77
2019-09-11 10:31:19 +08:00
jinhai
c1084e0788 Merge branch 'branch-0.4.0' into 'branch-0.4.0'
MS-540: update server config

See merge request megasearch/milvus!544

Former-commit-id: 84b61016370428345debed0c5c2a773685e1e478
2019-09-11 10:21:28 +08:00
zhiru
b76ad6b073 update server config
Former-commit-id: 540f2d12259f922f7eef41e6cda5a29ec19b0197
2019-09-11 10:17:26 +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
starlord
9665820452 add unitest
Former-commit-id: baa39b21f9095d00ef9c6ee43027d5acd993c54f
2019-09-10 20:09:56 +08:00
starlord
25210886d0 add unitest
Former-commit-id: 4843e1b14fa97b253a155a71ddb02f7c076942c4
2019-09-10 19:59:50 +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