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

862 Commits

Author SHA1 Message Date
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
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
kun yu
125191557c add empty and dim check 
Former-commit-id: 319232d98f8c22d600ef31001a3798fff4dc18dc
 2019-07-29 10:58:07 +08:00
jinhai
256b3702dc Merge branch 'branch-0.3.1' into branch-0.4.0 
Former-commit-id: 6445b9ad1ec8db0fa1399563f187d206df04c63d
 2019-07-28 09:55:56 +08:00
jinhai
5740985e0e Merge branch 'branch-0.3.1-xiaojun' into branch-0.4.0 
Former-commit-id: a4c620656251f284789bead020c70a8fd64b4143
 2019-07-28 09:30:31 +08:00
kun yu
95df40dd17 Merge remote-tracking branch 'upstream/branch-0.3.1' into without-grpc-vers 
DFHN


Former-commit-id: 518029590606985fe9693f59ce099dd059390c1f
 2019-07-27 16:48:09 +08:00
kun yu
54a71a9fa0 add CPU metrics 
Former-commit-id: bb2dffc5abb87340a58a4791a23e55858073531f
 2019-07-27 16:48:04 +08:00
kun yu
691df6ed18 add CPU_usage_rate Metrics 
Former-commit-id: a2a914159d759f9724b70954758cd22d7d5c98ff
 2019-07-27 16:19:34 +08:00
xj.lin
3314d47114 MS-288 update build stage 
Former-commit-id: d9e0bfbbbb5060b65311b2f6eb8eadf531b918c2
 2019-07-27 14:30:52 +08:00
starlord
4fc8921183 parallel reduce default false 
Former-commit-id: 863941e425c4c2653367d2da6f13bebcb2b5eb96
 2019-07-26 19:31:02 +08:00
xj.lin
66119dd20f MS-286 fix.. 
Former-commit-id: 056d394c7aff7f05ac5519a626e60e77e576fb63
 2019-07-26 17:45:14 +08:00
kun yu
92467dc304 fix HasTable bug 
Former-commit-id: 32797d1bbbdd953a492cabf7727dcedceb37e7a5
 2019-07-26 15:39:17 +08:00
jinhai
cf2aed57f4 Merge branch 'branch-0.3.1' into 'branch-0.3.1' 
MS-260 Refine log

See merge request megasearch/milvus!280

Former-commit-id: 342de0cd5859636f3ee26b4777c4a196f32acb16
 2019-07-26 13:07:39 +08:00
jinhai
fc0cf0a1f2 Merge branch 'fix-bug-without-grpc' into 'branch-0.3.1' 
fix quries/minute bug

See merge request megasearch/milvus!279

Former-commit-id: 6285b0b1a0d381771d4b44187f82e3344581ea81
 2019-07-26 13:07:27 +08:00
starlord
b5816a386c MS-260 Refine log 
Former-commit-id: 0fbaa027ff33645bae10ce31ecd9ffa3c17894df
 2019-07-26 12:29:36 +08:00
starlord
bf8f5cca34 MS-260 Refine log 
Former-commit-id: a67b4e677a6ad1b46a793119d19a6da85f2441c4
 2019-07-26 12:26:45 +08:00
kun yu
f74f9bb08c fix errorcode bug 
Former-commit-id: a96852ef86254e08549a683c65c6ec797a782b74
 2019-07-26 11:51:08 +08:00
kun yu
bc08eb278a Merge branch 'branch-0.3.1' of 192.168.1.105:kun.yu/milvus into branch-0.3.1 
Former-commit-id: 41b048b5c475833a6b7dc7aa52141447b855beaf
 2019-07-26 11:25:27 +08:00
kun yu
805aef38af fix quries/minute bug 
Former-commit-id: 63f4de823b290d346f4133d70e9a834054e12688
 2019-07-26 11:19:51 +08:00
starlord
b0557af128 MS-275 Avoid sqlite logic error excetion 
Former-commit-id: 88c2b25f471afd80338280d2a522de89b242051b
 2019-07-26 10:59:16 +08:00
starlord
640e9141c6 MS-275 Avoid sqlite logic error excetion 
Former-commit-id: d6ecaf2f32ed6c75370e6ed2bd24779cc18e76ff
 2019-07-26 10:54:49 +08:00
xj.lin
f37ae7765a MS-137 integrate knowhere... 
Former-commit-id: 04bd70d29d1da919dbff9c39e0c60ccc6db57d23
 2019-07-25 19:57:12 +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
zhiru
cfffcf9e9a Merge remote-tracking branch 'upstream/branch-0.3.1' into branch-0.3.1 
Former-commit-id: 4f3226d234fb9cbbab86cb7e85d65e97c5773e2c
 2019-07-24 20:34:33 +08:00