231 Commits

Author SHA1 Message Date
Yu Kun
d7936a6c60 add some parameters and merge upstream
Former-commit-id: 680349208d62108ceda4ad822c466107a840327c
2019-08-14 19:06:38 +08:00
starlord
dacd86f0af clean code
Former-commit-id: 81fdba0f5bc4e523f47b4f4f7fecac1fc5abdd62
2019-08-13 18:50:36 +08:00
Yu Kun
4ba11c02d4 add new interface definition
Former-commit-id: 1f5919bfd2b3a08422c408922733e40edd9c5db2
2019-08-13 15:37:16 +08:00
Yu Kun
f8b7df5e0b modify build.sh to make thrift on
Former-commit-id: b38a915b34149df47de5be0611970490dd2751aa
2019-08-09 18:24:01 +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
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
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
starlord
3056efda01 MS-312 Set openmp thread number by config
Former-commit-id: 511a0da7d85a341c0970f2e5823152b5ae2c71db
2019-08-08 10:37:01 +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
1b0dd8ee90 MS-312 Set openmp thread number by config
Former-commit-id: 7ddafa3aa22d0455b343d07cc37b1a30d1ac29a1
2019-08-06 17:42:35 +08:00
starlord
d2aa02084d MS-312 Set openmp thread number by config
Former-commit-id: 6ef7343aa6b908e6cd319271d4c60a49789eaf03
2019-08-06 17:31:43 +08:00
kun yu
b8a447990d merge branch-0.4.0
Former-commit-id: 8ab13046a40eb49349070ce4779dcae206647e02
2019-08-05 17:41:28 +08:00
kun yu
45bb9d679b Merge remote-tracking branch 'upstream/branch-0.4.0' into branch-0.4.0
Former-commit-id: 0c93c5c46c54a2e523142950a6f3bdc270235312
2019-08-05 09:44:42 +08:00
kun yu
409175f9d5 multi processes test
Former-commit-id: dd645c73b6983f86c5ed3b1a5a3480673bad4538
2019-08-05 09:44:29 +08:00
xj.lin
9d28b40b0d MS-288 update build stage
Former-commit-id: 8ee0976b88b0772d85d74f65b52e3484b4c76bd5
2019-08-03 17:07:36 +08:00
kun yu
24a32a1c68 Merge branch 'branch-0.3.1' into branch-0.4.0
Former-commit-id: 89766cb15b69b48e0472a6aa11fb9744d31ff0b0
2019-07-30 10:37:29 +08:00
kun yu
77e1ddd81b branch-0.4.0
Former-commit-id: a4df63653202df32d0b983de27f5c969905d17ac
2019-07-30 10:23:34 +08:00
kun yu
593010fd91 fix search error handle bug
Former-commit-id: f205dec24e64f3380a71699e0148789559301d92
2019-07-29 18:50:41 +08:00
kun yu
b9c11671c4 fix search error handle bug
Former-commit-id: dfded9c68611b0622581deebd1e94363566af432
2019-07-29 18:05:14 +08:00
kun yu
0c580bfa13 fix conflict
Former-commit-id: b1ebf9db86289bcb6afd9f30c3525b0df40433d6
2019-07-29 11:40:27 +08:00
kun yu
125191557c add empty and dim check
Former-commit-id: 319232d98f8c22d600ef31001a3798fff4dc18dc
2019-07-29 10:58:07 +08:00
kun yu
92467dc304 fix HasTable bug
Former-commit-id: 32797d1bbbdd953a492cabf7727dcedceb37e7a5
2019-07-26 15:39:17 +08:00
kun yu
f74f9bb08c fix errorcode bug
Former-commit-id: a96852ef86254e08549a683c65c6ec797a782b74
2019-07-26 11:51:08 +08:00
jinhai
2ac2dfca01 Fix build error and refactor code
Former-commit-id: da6bf57fdebc0fc9b03251d7d9eb6c398dd35770
2019-07-25 19:57:10 +08:00
kun yu
6aba1d011b pull upstream
Former-commit-id: 82dafb79113706d919562c5aeefbf32ae010f9c3
2019-07-25 17:26:30 +08:00
kun yu
af074d0eb5 Merge remote-tracking branch 'upstream/branch-0.3.1' into branch-0.3.1
Former-commit-id: f3aad0f877176111021d537aa7ffcfb217041f45
2019-07-25 15:58:16 +08:00
jinhai
17fe748d30 MS-279 Merge from Branch-0.3.1
Former-commit-id: cd9e051d00423ae8a25f100366b1050f1604fca2
2019-07-24 21:28:24 +08:00
kun yu
db15ea57e9 fix structure
Former-commit-id: 6b4afd3c15236340eb666f22a0150ce090202b04
2019-07-24 19:29:18 +08:00
starlord
ed029178c4 MS-266 Improve topk reduce time by using multi-threads
Former-commit-id: 79e4cfe6ade7b0fc059cd246c4b670a4b5343ca3
2019-07-24 12:48:36 +08:00
starlord
07a9fdb8ca MS-246 refine log
Former-commit-id: 87ef7f959b43e92c3e7687f9f8e1d059cc353f79
2019-07-23 15:42:17 +08:00
starlord
5f86066e8d MS-246 refine log
Former-commit-id: d8c30756db5666f964fd4fcf63fdc4a7ab08a4ea
2019-07-22 17:49:11 +08:00
starlord
add911ae22 MS-249 Check machine hardware during initialize
Former-commit-id: 9f42d9c41dcfac9bc1716737368826bfcd777251
2019-07-22 15:33:36 +08:00
starlord
eb1d1e393f MS-249 Check machine hardware during initialize
Former-commit-id: e513499fb015a6867a762a10b629dd774182f21a
2019-07-22 11:15:11 +08:00
starlord
b285c64e96 Check machine hardware during initialize
Former-commit-id: fe3efe3b519235d9579e0c311a7da3f7a299154f
2019-07-22 10:44:24 +08:00
starlord
9811720ae9 invalid topk
Former-commit-id: 3e5abac60d4c1b029f633f4162e504b543f36357
2019-07-21 18:34:59 +08:00
starlord
30513e6fa5 MS-260 refine log
Former-commit-id: 993f8fc97aba4ff7a696e3c355eccf1b837896c6
2019-07-21 18:03:35 +08:00
starlord
e7888afbd3 MS-256 - Add more cache config
Former-commit-id: e65326f81cc7d051a33461af746a6fa8ef1e798c
2019-07-21 14:10:32 +08:00
starlord
1ee82f8876 fix a typo
Former-commit-id: 8bbbf2d38c2273c646c9b6991536d26d2bd0252b
2019-07-18 15:10:57 +08:00