468 Commits

Author SHA1 Message Date
Yu Kun
179a0feabf modify format
Former-commit-id: 74f43325a1b8ae17b1b7a5aeb61f0c6d7fd42de4
2019-08-08 15:02:27 +08:00
starlord
4d5618f4c3 MS-327 clean code
Former-commit-id: 9ca0ea6cb89b3fb95e17b0c0d6f647fe0c3ff7c4
2019-08-08 14:20:00 +08:00
kun yu
01a30b2ea6 merge upstream/branch-0.4.0
Former-commit-id: db495b0e7f256b98485986281fe83edf8beb6970
2019-08-07 20:23:39 +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
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
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
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
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
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
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
starlord
42bf2b0c46 MS-251 Build/Merge background thread error handling
Former-commit-id: b1d60b8ac5af8a0cf3fdfeb815c4b099e88a3e55
2019-08-01 14:09:51 +08:00
kun yu
0c580bfa13 fix conflict
Former-commit-id: b1ebf9db86289bcb6afd9f30c3525b0df40433d6
2019-07-29 11:40:27 +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
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
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
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
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
zhiru
837da04dc9 add IndexStatsHelper
Former-commit-id: 6579465eb992d10a9a2f10b0f129341664f9b77d
2019-07-24 20:34:11 +08:00
kun yu
db15ea57e9 fix structure
Former-commit-id: 6b4afd3c15236340eb666f22a0150ce090202b04
2019-07-24 19:29:18 +08:00
starlord
8b757539d2 MS-266 Improve topk reduce time by using multi-threads
Former-commit-id: fb7b6588c31ca34b48e349a5b928bca2d21fbc20
2019-07-24 16:28:47 +08:00
starlord
e51b7f1619 Merge remote-tracking branch 'source/branch-0.3.1' into branch-0.3.1
Former-commit-id: 6093fec932087c5c92d82e454d76bd614090615e
2019-07-24 12:48:47 +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
jinhai
aee7809c61 MS-273 Add some logs and reformat code, fix compile error
Former-commit-id: 5bf635ab31d5dfd0cdb558b7f038670098d75ed0
2019-07-24 11:17:53 +08:00
jinhai
34ca37d9a0 MS-273 Add some logs and reformat code
Former-commit-id: 5dfd98a0b954d5cc44ae40f6b14ce65a15d76f80
2019-07-24 11:02:22 +08:00
starlord
07a9fdb8ca MS-246 refine log
Former-commit-id: 87ef7f959b43e92c3e7687f9f8e1d059cc353f79
2019-07-23 15:42:17 +08:00
xj.lin
813f5151e8 MS-267 Support Inner Product
update..


Former-commit-id: 8fdbb39fbdd05853f25c374f437f3ed78a46345d
2019-07-22 20:12:33 +08:00
xj.lin
ba7e3c3dd2 MS-265 IVFSQ
Former-commit-id: 6b0638af562ed60bc2252e4430c1018e29ae857c
2019-07-22 16:37:06 +08:00