2879 Commits

Author SHA1 Message Date
Yu Kun
f5eefaad26 Merge remote-tracking branch 'upstream/branch-0.5.0' into branch-0.5.0-yk
Former-commit-id: bebd077060b057a8fcf08ed0d575868b8d087907
2019-10-11 20:09:29 +08:00
Yu Kun
762140abc7 MS-637 - out of memory when load too many tasks
Former-commit-id: 9c40f373286086f57b02da119212b665d1cb8e8c
2019-10-11 20:08:05 +08:00
jinhai
30a52e3084 Merge branch 'new_compile_defination' into 'branch-0.5.0'
MS-635 New compile defination

See merge request megasearch/milvus!691

Former-commit-id: 3e4864385c93dbd3159d0213f9d9f4cdf546aa82
2019-10-11 19:51:34 +08:00
jinhai
c8feb980fe Merge branch 'branch-0.5.0-yk' into 'branch-0.5.0'
MS-636 Add optimizer in scheduler for FAISS_IVFSQ8H

See merge request megasearch/milvus!690

Former-commit-id: 5c239cfe28b286e8047a4386dc4a83825f3d5161
2019-10-11 19:51:15 +08:00
xiaojun.lin
7bc9039f2c MS-635 coding style check
Former-commit-id: 06afc01551073cd4ef3c2dc9dace407e441458a7
2019-10-11 19:49:48 +08:00
xiaojun.lin
5bcb660110 MS-635 add compile option
Former-commit-id: 773d61d34bdb131ae3219ddfbe9e4eb656292230
2019-10-11 19:41:43 +08:00
Yu Kun
8ab67f6965 Merge remote-tracking branch 'upstream/branch-0.5.0' into branch-0.5.0-yk
Former-commit-id: a29b4ca4764ad56d6da5d3d7c357a87e318e0704
2019-10-11 17:38:55 +08:00
Yu Kun
59f45763d3 MS-636 Add optimizer in scheduler for FAISS_IVFSQ8H
Former-commit-id: 4dff6236c98a86965e686b4a94e5492e0c1d5722
2019-10-11 17:38:48 +08:00
peng.xu
6dee58f9e7 Merge branch 'branch-0.5.0' into 'branch-0.5.0'
refine code

See merge request megasearch/milvus!689

Former-commit-id: 657055f806487253a110dffafbcc33b451e559b5
2019-10-11 16:19:00 +08:00
starlord
8a9e760639 refine code
Former-commit-id: 7935a4ed21d423e5fc72adc8ab68b7f69dae554e
2019-10-11 16:18:19 +08:00
jinhai
c884b9fde2 Merge branch 'branch-0.5.0' into 'branch-0.5.0'
solve cpplint

See merge request megasearch/milvus!688

Former-commit-id: ecd1da1744a2b0e7ccb0743aa195e7b23478064d
2019-10-10 21:14:34 +08:00
wxyu
75de7e191c solve cpplint
Former-commit-id: 1d500a125ac8a72a18e51e5a3ccdb0369ba0af4a
2019-10-10 21:14:07 +08:00
jinhai
93925b5be2 Merge branch 'branch-0.5.0' into 'branch-0.5.0'
MS-631 IVFSQ8H Index support

See merge request megasearch/milvus!687

Former-commit-id: b9cd733409cafec934ec2e6333fd283ba380895b
2019-10-10 21:04:19 +08:00
wxyu
0712798938 MS-631 IVFSQ8H Index support
Former-commit-id: 21e17a20794e4fde31e79c4bbd4e26d46c79d886
2019-10-10 20:57:14 +08:00
peng.xu
57daf170ee Merge branch 'branch-0.5.0' into 'branch-0.5.0'
format code

See merge request megasearch/milvus!686

Former-commit-id: b4e8582ed68587d5239ef49c1ce01e194500e92e
2019-10-10 16:04:12 +08:00
starlord
defd24b2c6 format code
Former-commit-id: 648cc3be7f2dc4cca5c1394ff83c2d383c7b70b7
2019-10-10 16:03:29 +08:00
jinhai
6769b6d960 Merge branch 'branch-0.5.1' into 'branch-0.5.0'
Format the code

See merge request megasearch/milvus!685

Former-commit-id: 853243085b31e4d1856e3a7c944f323a78a91263
2019-10-10 15:44:24 +08:00
jinhai
092ed2ecbc Merge branch 'branch-0.5.0-yk' into 'branch-0.5.0'
Add ToIndexData for CopyToIndexFileToGpu

See merge request megasearch/milvus!684

Former-commit-id: f7f497e86d3cce7604157d54f9ec09986429f3b8
2019-10-10 15:43:39 +08:00
JinHai-CN
cdf910b6e8 Format the code
Former-commit-id: 35eee89fce00364921cf35ad8539197edbdb8a01
2019-10-10 15:41:49 +08:00
Yu Kun
33b398061d Merge remote-tracking branch 'upstream/branch-0.5.0' into branch-0.5.0-yk
Former-commit-id: 292543d7dad2d99b79d2a70170b8da3e295b64ef
2019-10-10 15:38:29 +08:00
jinhai
88906b1aec Merge branch 'branch-0.5.1' into 'branch-0.5.0'
MS-627 Integrate new index: IVFSQHybrid

See merge request megasearch/milvus!683

Former-commit-id: 7f176330c1b32e4fa161e5c11a747266017c89b2
2019-10-10 15:35:49 +08:00
xiaojun.lin
725c3b5e1d Merge branch 'branch-0.5.1' of http://192.168.1.105:6060/jinhai/milvus into branch-0.5.1
Former-commit-id: 141aae3ed35f8d978b5d1ae29c9ee6fdb1a7ed8d
2019-10-10 15:35:30 +08:00
xiaojun.lin
f4611e3840 Merge branch 'branch-0.5.1' of http://192.168.1.105:6060/jinhai/milvus into branch-0.5.1
Former-commit-id: 73cc669f16dae2613baf3336ef08180929044bbf
2019-10-10 15:35:22 +08:00
Yu Kun
762fc164cc clang tidy and clang format
Former-commit-id: 2bee4aa19cf50687308cf94dc4a7c9a735386789
2019-10-10 15:34:26 +08:00
Yu Kun
f9f336efc3 Add ToIndexData for CopyToIndexFileToGpu
Former-commit-id: 901d2113cb3530b7425f267b34f42e99439b6e0c
2019-10-10 15:31:39 +08:00
xiaojun.lin
9e79bb9a7e Merge branch 'branch-0.5.1' of http://192.168.1.105:6060/jinhai/milvus into branch-0.5.1
Former-commit-id: 1b8c7bfed00a4d34aa1fa147fc32a6464fecf9a1
2019-10-10 15:20:44 +08:00
xiaojun.lin
7a4e30d716 Merge remote-tracking branch 'upstream/branch-0.5.0' into branch-0.5.1
Former-commit-id: 12ff8f9e496bd5f194d481b31a5479a80faae6e1
2019-10-10 15:20:35 +08:00
xiaojun.lin
71374bdd91 Merge remote-tracking branch 'upstream/branch-0.5.0' into branch-0.5.1
Former-commit-id: 583c0e2d0a8134882b92f6e6c415613739bc36dd
2019-10-10 15:16:21 +08:00
jinhai
e8b09efaaf Merge branch 'branch-0.5.0' into 'branch-0.5.0'
MS-626 Refactor DataObj to support cache any type data

See merge request megasearch/milvus!682

Former-commit-id: 15f33afbfd88993a92baab53cd979e6b65e045e2
2019-10-10 15:13:15 +08:00
wxyu
92e39de8be MS-626 Refactor DataObj to support cache any type data
Former-commit-id: 4833ed21851689b234ab513de0929a25ae1ee941
2019-10-10 15:12:54 +08:00
jinhai
16cdd21795 Merge branch 'branch-0.5.0' into 'branch-0.5.0'
MS-626 Refactor DataObj to support cache any type data

See merge request megasearch/milvus!681

Former-commit-id: c61d2b112c65fe5a106f9621b86a616c00af8da2
2019-10-10 14:34:50 +08:00
wxyu
14685f77d2 solve conflicts
Former-commit-id: d6f938da342cc6c7643f3cc1fd41f5a6212a5ecd
2019-10-10 14:33:56 +08:00
wxyu
729ccc8c25 MS-626 Refactor DataObj to support cache any type data
Former-commit-id: d3ac029a909bfc0a98f3f968ba52326243da40d4
2019-10-10 14:33:16 +08:00
xiaojun.lin
77b28a3981 enable hybrid IVFSQ8
Former-commit-id: 9bbf835e63818ef6cc5f792d0ab11247794d0c3a
2019-10-10 14:28:00 +08:00
peng.xu
b61f982265 Merge branch 'branch-0.5.0' into 'branch-0.5.0'
MS-620 Get table row counts display wrong error code

See merge request megasearch/milvus!680

Former-commit-id: e45a1edafd3591361e132a256686e43ed8723280
2019-10-10 11:41:26 +08:00
starlord
d96d589b7d Merge remote-tracking branch 'source/branch-0.5.0' into branch-0.5.0
Former-commit-id: c0d9e0a5eb2418a500beccee9e62bef05cf68089
2019-10-10 11:40:33 +08:00
starlord
b8e97f1d4d MS-620 Get table row counts display wrong error code
Former-commit-id: efac2241b903fbb45eb26adf2d9dfd79fa8f1353
2019-10-10 11:40:25 +08:00
peng.xu
620c554a12 Merge branch 'branch-0.5.0' into 'branch-0.5.0'
Branch 0.5.0

See merge request megasearch/milvus!679

Former-commit-id: 2666d839cd4e4eb1f68b18f6ca1c614612a28b91
2019-10-10 11:28:27 +08:00
starlord
682b50de0e Merge branch 'branch-0.5.0' of 192.168.1.105:groot/vecwise_engine into branch-0.5.0
Former-commit-id: e1747e56ece9016eb495e634b2070e8eafb8212b
2019-10-10 11:27:55 +08:00
starlord
54484d79ce refine code
Former-commit-id: b9b9ef25426ad7908fad62f462f24dd52c737de6
2019-10-10 11:27:46 +08:00
starlord
83652174c5 Merge remote-tracking branch 'source/branch-0.5.0' into branch-0.5.0
Former-commit-id: 3e37dc41f95e3b25a9cf2d07dd3e2f93a7f4532c
2019-10-10 11:24:36 +08:00
starlord
cfcf3256ac refine code
Former-commit-id: e1348890cd447aa9e1cc1b63614f223b2ba58605
2019-10-10 11:24:33 +08:00
peng.xu
140333ca4a Merge branch 'branch-0.5.0-yk' into 'branch-0.5.0'
using clang-format-6.0

See merge request megasearch/milvus!677

Former-commit-id: 5510fdd97a929adea6b554736408d71530eab9e8
2019-10-10 11:08:09 +08:00
peng.xu
6a225a06eb Merge branch 'branch-0.5.0' into 'branch-0.5.0'
MS-622 Delete vectors should be failed if date range is invalid

See merge request megasearch/milvus!678

Former-commit-id: 96d3069381373dcf62813b56fd674ae027adefd0
2019-10-10 11:07:53 +08:00
starlord
cc8205af3d Merge branch 'branch-0.5.0' of 192.168.1.105:groot/vecwise_engine into branch-0.5.0
Former-commit-id: 1c447892b7b3871c3b2025c14a27c5f764068bfa
2019-10-10 11:06:02 +08:00
starlord
3eb79168ff Merge remote-tracking branch 'source/branch-0.5.0' into branch-0.5.0
Former-commit-id: 17efb1fd89f4391d198817dd668843d7377ff61d
2019-10-10 11:05:15 +08:00
starlord
e4889de803 MS-622 Delete vectors should be failed if date range is invalid
Former-commit-id: bedb2fcb458f9f2cd94c02d3095044aff8630f6b
2019-10-10 11:04:57 +08:00
Yu Kun
816dce3bab using clang-format-6.0
Former-commit-id: 8e81b9845581c8a04a95049af635545905c4c1a2
2019-10-10 10:59:54 +08:00
starlord
034157c212 MS-622 Delete vectors should be failed if date range is invalid
Former-commit-id: 58ddce94d743c7dd5e97d2ed0f05658b15e6f69a
2019-10-10 10:45:11 +08:00
jinhai
844d80243a Merge branch 'branch-0.5.0-yk' into 'branch-0.5.0'
MS-603 Add BuildIndex to scheduler

See merge request megasearch/milvus!676

Former-commit-id: eb7e8acebc986123d7756b728795de7e67fbb7a7
2019-10-10 10:27:19 +08:00