admin/milvus
1
0
Fork 0
mirror of https://gitee.com/milvus-io/milvus.git synced 2025-12-31 16:05:30 +08:00
Code Issues Packages Projects Releases Wiki Activity
1,805 Commits 136 Branches 186 Tags
Commit Graph

887 Commits

Author SHA1 Message Date
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
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
kun yu
50d4411fea Merge remote-tracking branch 'upstream/branch-0.3.1' into without-grpc-version 
Former-commit-id: c879bb4efe166bb643d8a990606d6585470a22c3
 2019-08-06 11:27:49 +08:00
kun yu
6d41eb5650 add temperature and pcpu 
Former-commit-id: 79e80d6e4ee42e05a5f9e60021fc4cc7ff9cc04d
 2019-08-06 11:27:23 +08:00
kun yu
b8a447990d merge branch-0.4.0 
Former-commit-id: 8ab13046a40eb49349070ce4779dcae206647e02
 2019-08-05 17:41:28 +08:00
jinhai
93c246fd7e Merge branch 'branch-0.3.1' into branch-0.4.0 
Former-commit-id: fad50511cc6894adb68b05a933c6519c0c415a89
 2019-08-05 14:18:21 +08:00
kun yu
0a8edff148 merge brach-0.4.0 
Former-commit-id: c752d75ebd02e18c7e5fc1fb21edb32d1c381aff
 2019-08-05 14:15:52 +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
adc77015b3 MS-307 enable-nsg 
Former-commit-id: 5ed714d17e5ad58b610fd01d1041eb11203b15bf
 2019-08-03 19:38:35 +08:00
xj.lin
3db2702ae8 Merge remote-tracking branch 'upstream/branch-0.4.0' into enable_nsg 
Former-commit-id: 77d19051a4a9a945fc6068fa2641d0343b69ca27
 2019-08-03 17:08:04 +08:00
xj.lin
9d28b40b0d MS-288 update build stage 
Former-commit-id: 8ee0976b88b0772d85d74f65b52e3484b4c76bd5
 2019-08-03 17:07:36 +08:00
jinhai
c48357dd5b Merge branch 'branch-0.3.1' into 'branch-0.3.1' 
MS-251 Build/Merge background thread error handling

See merge request megasearch/milvus!302

Former-commit-id: 3820c658e6c2f86e683955979313d19009c10284
 2019-08-02 20:52:08 +08:00
kun yu
90516aeb52 Merge remote-tracking branch 'upstream/branch-0.4.0' into branch-0.4.0 
Former-commit-id: 5474859a3d793694efca59e69eb33bedc2588baf
 2019-08-02 19:30:15 +08:00
kun yu
0a9d60c504 modify clienttest 
Former-commit-id: 512bbc2d6c6ae19d4c84befd71c41e79c67b5da0
 2019-08-02 19:30:10 +08:00
starlord
60f527c9c6 MS-251 Build/Merge background thread error handling 
Former-commit-id: 31f019f55f7c0bb896ebc6a5905af9ed07143cfc
 2019-08-02 19:14:03 +08:00
jinhai
678897aa2d Merge branch 'without-grpc-version' into 'branch-0.3.1' 
Without grpc version

See merge request megasearch/milvus!292

Former-commit-id: 9f08a29c1b17a8e9f051b57055c334e674dd2464
 2019-08-01 16:57:18 +08:00
kun yu
07de60005e fix GPU Percent bug 
Former-commit-id: 0afa5d7a6a50c6a545c6fde296702580885d27b5
 2019-08-01 14:42:20 +08:00
starlord
3a65524ef3 Merge branch 'branch-0.3.1' into 'branch-0.4.0' 
MS-251 Build/Merge background thread error handling

See merge request groot/vecwise_engine!3

Former-commit-id: df7398aa2630011b83b2b92e39d7c7ea094d5325
 2019-08-01 14:32:30 +08:00
kun yu
af86fb92f3 modify prometheus 
Former-commit-id: 95f2999b8627673954e16436ec07a890ba5cd22b
 2019-08-01 14:30:00 +08:00
starlord
42bf2b0c46 MS-251 Build/Merge background thread error handling 
Former-commit-id: b1d60b8ac5af8a0cf3fdfeb815c4b099e88a3e55
 2019-08-01 14:09:51 +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
dfb35391ba fix error handle while using stream 
Former-commit-id: 2400cb8c1dea0a0c1b6de5a9a653c639122e2ecd
 2019-07-29 20:17:10 +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