2861 Commits

Author SHA1 Message Date
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
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
JinHai-CN
d4babbcae1 Use new faiss package
Former-commit-id: 520b90709373d8892a1f6f3f0fa353d9bf1f9555
2019-10-10 10:16:32 +08:00
Yu Kun
f8b9091f41 clang tidy
Former-commit-id: 1d226a67672476b82957e27e60839283259d7159
2019-10-10 10:15:00 +08:00
Yu Kun
5111bc05d7 Merge remote-tracking branch 'upstream/branch-0.5.0' into branch-0.5.0-yk
Former-commit-id: 2e34ac4d0017f71c68cbfc22ee195882b25ad8d9
2019-10-10 09:32:19 +08:00
JinHai-CN
8f052f509f Add one more interface: UnsetQuantizer
Former-commit-id: 4cac2a470925db8286e142e4332aae1564af4391
2019-10-09 19:42:30 +08:00
Jeff
a56d6042e6 Update milvus_build.groovy
Former-commit-id: 0bf469df7faa46619c13e99c4c0bfc5a1dad885c
2019-10-09 19:32:32 +08:00
Jeff
39c3dd5123 Update milvus_build_no_ut.groovy
Former-commit-id: 60d4af9f3828a6109b78fa1d857ecc42beec0804
2019-10-09 19:31:56 +08:00
xiaojun.lin
04524d9c0e hybrid enable
Former-commit-id: 9c89d56f61445c1b1eda80b1403165aba2d3b986
2019-10-09 17:58:59 +08:00
xiaojun.lin
5807d62db0 add hybrid mode
Former-commit-id: feae4c8df728c1ae8f96e2d19c0b115a5a420575
2019-10-09 17:57:49 +08:00
peng.xu
6e4267a34a Merge branch 'branch-0.5.0' into 'branch-0.5.0'
format code

See merge request megasearch/milvus!675

Former-commit-id: 709b6f23424bdddd484cdde8466e098a40b1e41a
2019-10-09 17:51:38 +08:00
starlord
cd4561923a format code
Former-commit-id: 162d51623727cf2f655ff54080daf3bc18e02f07
2019-10-09 17:51:01 +08:00
test
03c648df57 MS-575 Add Clang-format & Clang-tidy & Cpplint
Former-commit-id: 4b6f60b7ab2d654b08dbe46ff167477c5612dd1c
2019-10-09 09:35:13 +00:00
Yu Kun
d8b63909db Merge remote-tracking branch 'upstream/branch-0.5.0' into branch-0.5.0-yk
Former-commit-id: 800d8e422e6a1e836389987ad22a6723fe36cadf
2019-10-09 17:21:48 +08:00
peng.xu
e68a4efd5e Merge branch 'branch-0.5.0' into 'branch-0.5.0'
disable clang-tidy

See merge request megasearch/milvus!674

Former-commit-id: dded4b8476538aa517658a53a58320ed8915f1cd
2019-10-09 17:21:09 +08:00
peng.xu
e6062e72e4 Merge branch 'fix_thermal_bug' into 'branch-0.5.0'
fix stupid error

See merge request megasearch/milvus!673

Former-commit-id: 90c96f9f742a8c013a4956ad7f3c3e52c61d83c7
2019-10-09 17:20:52 +08:00
starlord
862fea498b disable clang-tidy
Former-commit-id: c19aa457fd0f609e8e1eddd8ea7a6af771d53180
2019-10-09 17:20:24 +08:00
Heisenberg
bc62ede846 fix stupid error
Former-commit-id: b49098aae7927cc67c241441e51632d63bf06fe2
2019-10-09 17:19:47 +08:00
Yu Kun
b142b59170 Merge remote-tracking branch 'upstream/branch-0.5.0' into branch-0.5.0-yk
Former-commit-id: e7d9bda0f7d97a1af7f507160706b54a436bd353
2019-10-09 17:17:33 +08:00
Yu Kun
5df210f924 code format
Former-commit-id: c97b162cf28301a5b1838377bdb71d4ad14daca2
2019-10-09 17:17:25 +08:00