1302 Commits

Author SHA1 Message Date
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
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
starlord
414be9021d MS-330 Stability test failed caused by server core dumped
Former-commit-id: 66079f9b51b0e40adfc6dfbcf2d2156431124ebb
2019-08-09 18:19:07 +08:00
quicksilver
aeae907d6d update build.sh
Former-commit-id: ec1488d6e4fecc756349dd88b056dda24b181b9a
2019-08-09 18:13:47 +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
starlord
ce7e835658 handle exception in merge file
Former-commit-id: 0b1503599944acafa30e12642c3e00c915afc223
2019-08-09 15:34:11 +08:00
quicksilver
096845036b update grpc md5
Former-commit-id: 57821ab629fb4e144d2be216ce3d9cc0875afe56
2019-08-09 10:56:15 +08:00
quicksilver
f50fa28ce8 add grpc cache
Former-commit-id: bd68cc1dcd7521f0daf66630fd00bf97d2145efe
2019-08-09 10:21:58 +08:00
quicksilver
dd838e513c update cpp/cmake/BuildUtils.cmake
Former-commit-id: 0abe49b884bf39247e0e1f303c7f3f71b2511f5f
2019-08-08 19:21:21 +08:00
Yu Kun
e4622314a8 add knowhere submodule back
Former-commit-id: b55a72fb55aea84b8df68971bd02188d51d21aed
2019-08-08 17:46:41 +08:00
Yu Kun
87226f5e92 add knowhere submodule back
Former-commit-id: 3da9baeac0ae5e163879f2adaacce5adad4f1f65
2019-08-08 17:39:36 +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
Yu Kun
f7de49afe7 remove knowhere_build
Former-commit-id: 0a8468cb0f2247c81e39bf1215210470a277ba0a
2019-08-08 15:46:18 +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
bbb49b4443 add changelog
Former-commit-id: 9eec1e77d6566b2142adcbb751668c810fa65646
2019-08-07 20:08:49 +08:00
kun yu
cc5ab807fc delete knowhere
Former-commit-id: c04ad4797de102962ee39c6cf364926a120ddcd8
2019-08-07 20:01:44 +08:00
kun yu
fe165a6165 delete knowhere
Former-commit-id: 295df91cf494ef9c1212a56fc2d4213ff8bc1d4d
2019-08-07 19:58:32 +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
4f79adcc86 add grpc
Former-commit-id: 34b2d866ee82370b6aa7fe6e18aae14a109cf5ab
2019-08-06 19:21:11 +08:00
zhiru
bdc18ec361 add grpc
Former-commit-id: 5d2b02bc28510c77628b62ffdff7c01918b99a1e
2019-08-06 18:11:51 +08:00
zhiru
66d1cfe0c3 cmake: add grpc
Former-commit-id: 95283ed048e3c441c5005191adcccc29df04c4c3
2019-08-06 18:09:39 +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
starlord
e9bb2e77fa MS-312 Set openmp thread number by config
Former-commit-id: 897d1c7387655046b4f769d695b9415785bd5108
2019-08-06 17:33:33 +08:00
starlord
d2aa02084d MS-312 Set openmp thread number by config
Former-commit-id: 6ef7343aa6b908e6cd319271d4c60a49789eaf03
2019-08-06 17:31:43 +08:00
quicksilver
b43ad62fa4 add gperftools cache
Former-commit-id: 4e42aaf2971f31b69b9074af189c31110c9474a2
2019-08-06 16:06:07 +08:00