2968 Commits

Author SHA1 Message Date
jinhai
17e97a3b75 Merge branch 'fix_hybrid' into 'branch-0.5.0'
Fix hybrid

See merge request megasearch/milvus!717

Former-commit-id: 686e6891173231a78bcf4be1b66ee3f3977a8004
2019-10-14 19:28:09 +08:00
xiaojun.lin
5f39d252d1 update
Former-commit-id: eafa332562298fe5666632c017c7584c45272848
2019-10-14 19:27:46 +08:00
xiaojun.lin
80339fae7b update
Former-commit-id: 34c175b32ce8eaab4505759e80c61128e34262f8
2019-10-14 19:24:29 +08:00
xiaojun.lin
8a2d5c8296 fix copy_cpu_to_gpu
Former-commit-id: 8703a392ac93bd9450492a6841a169bb2287c6ea
2019-10-14 19:20:08 +08:00
peng.xu
adabecba29 Merge branch 'branch-0.5.0' into 'branch-0.5.0'
MS-606 fix result reduce bug

See merge request megasearch/milvus!716

Former-commit-id: 397fccaf02a66fb7eb062df29807430a7e13df61
2019-10-14 18:22:05 +08:00
yudong.cai
44b830639a MS-606 fix result reduce bug
Former-commit-id: 86bf350874b7a5ec72e77eea2be1f8a5a8548e19
2019-10-14 18:20:15 +08:00
peng.xu
f6232584aa Merge branch 'branch-0.5.0-yk' into 'branch-0.5.0'
MS-644 - Search crashed with index-type: flat

See merge request megasearch/milvus!715

Former-commit-id: ac8f9df62f2c65edeecac5e32f5e04dc48fd2e4f
2019-10-14 17:39:41 +08:00
Jeff
e29fd5a3bc Merge branch 'branch-0.5.0' into 'branch-0.5.0'
update grpc download url to https://github.com/youny626/grpc-milvus/archive/master.zip

See merge request megasearch/milvus!714

Former-commit-id: 47ddb6bf673daea83ec820d9422094addaa0570d
2019-10-14 17:35:42 +08:00
zhiru
44eda65b41 update grpc download url to https://github.com/youny626/grpc-milvus/archive/master.zip
Former-commit-id: ae1134f8ab9b2e7c7f1c4c1464993c35d1491fd5
2019-10-14 17:35:21 +08:00
zhiru
0d6966b41b update grpc download url to https://github.com/youny626/grpc-milvus/archive/master.zip
Former-commit-id: 06dfa0e0876376498d48d09d5b7c4d2ee634fbbc
2019-10-14 17:19:10 +08:00
Yu Kun
ed93701efd MS-644 - Search crashed with index-type: flat
Former-commit-id: cf79b2ed46c1f33ba62e60a0ec77f769354c5a24
2019-10-14 17:09:37 +08:00
Yu Kun
6832422b2f MS-644 - Search crashed with index-type: flat
Former-commit-id: e63705484e47811a611c6ffdd7ff8660577cd615
2019-10-14 17:07:33 +08:00
Yu Kun
31de75cd7f MS-644 - Search crashed with index-type: flat
Former-commit-id: f9d38e6093357bfbb650487ca868b948f15b5656
2019-10-14 17:07:10 +08:00
peng.xu
8cec6faaf3 Merge branch 'branch-0.5.0' into 'branch-0.5.0'
fix jenkins build

See merge request megasearch/milvus!713

Former-commit-id: 8952390ca1dbf80492ec98165b23f76da44e0d38
2019-10-14 16:42:47 +08:00
starlord
afa828959f fix jenkins build
Former-commit-id: cffce6458aedadb4328fa6dc1a172de1c85a5a1b
2019-10-14 16:41:58 +08:00
peng.xu
d6c8ebcd66 Merge branch 'branch-0.5.0' into 'branch-0.5.0'
MS-624 Search vectors failed if time ranges long enough

See merge request megasearch/milvus!712

Former-commit-id: 64fae9311192cf6c4747698c543dce39866b9b55
2019-10-14 16:26:12 +08:00
starlord
fa3b7f6bdc MS-624 Search vectors failed if time ranges long enough
Former-commit-id: c215db9f3606e42b21f45ea0b3c9fa349aba01d4
2019-10-14 16:16:30 +08:00
starlord
766c8f99c3 MS-624 Search vectors failed if time ranges long enough
Former-commit-id: ef8933fcce46e08184581e9dfb8f6dd46e65f86e
2019-10-14 16:06:46 +08:00
peng.xu
25894b28ee Merge branch 'fix_testivf' into 'branch-0.5.0'
MS-648 fix ivf test

See merge request megasearch/milvus!711

Former-commit-id: 1f623de80f8e4c2668f2a30c7a069433c9d333a6
2019-10-14 16:00:11 +08:00
xiaojun.lin
6f74ca8260 MS-648 fix ivf test
Former-commit-id: dedaac89b832cd6a8cf3c0ac754f221c762e2893
2019-10-14 15:58:38 +08:00
peng.xu
e037b64d65 Merge branch 'branch-0.5.0' into 'branch-0.5.0'
fix build error

See merge request megasearch/milvus!710

Former-commit-id: c82064b29a0d7576322b876e0d72ef412cee4370
2019-10-14 15:38:00 +08:00
starlord
3b73e99b28 check insert vector count and id count
Former-commit-id: bc2c5bd8e01271fb4f043d53e9c634e42b31ee64
2019-10-14 15:36:54 +08:00
starlord
f1d549d22f fix build error
Former-commit-id: bfdde4eb57a2be02a87bb989859ece66e6289915
2019-10-14 15:13:50 +08:00
peng.xu
5b93d1e903 Merge branch 'branch-0.5.0' into 'branch-0.5.0'
modify jenkins ci file

See merge request megasearch/milvus!709

Former-commit-id: 389f84947afa52436b9b9156191171d22f572056
2019-10-14 14:44:58 +08:00
starlord
90c4546f75 modify jenkins ci file
Former-commit-id: 2c00819c479d278f12670cce25b867e3550ace2b
2019-10-14 14:44:26 +08:00
Yu Kun
48d664ecb3 Merge remote-tracking branch 'upstream/branch-0.5.0' into branch-0.5.0-yk
Former-commit-id: a4fcc852070d47b5484a089c87dea3dbdaeb7bae
2019-10-14 14:31:50 +08:00
peng.xu
efa0b50fa5 Merge branch 'branch-0.5.0' into 'branch-0.5.0'
add tbb so

See merge request megasearch/milvus!708

Former-commit-id: 7a3f4ce1b0e410345c66e2fc1b4dcae3f677c639
2019-10-14 14:30:31 +08:00
starlord
0f58d2da73 remove unused files
Former-commit-id: 3d196d97985b876d064a806fdc0c539c494aa55a
2019-10-14 14:29:53 +08:00
starlord
a043de2f5c add tbb so
Former-commit-id: c8f3f3a6d888e64eec17b5b3a38a09682ea16def
2019-10-14 14:28:17 +08:00
Yu Kun
bc55be178b Merge remote-tracking branch 'upstream/branch-0.5.0' into branch-0.5.0-yk
Former-commit-id: 906885f862d0ecc58eac49dbf2f08b8e7e47395f
2019-10-14 13:02:27 +08:00
Yu Kun
8a49d11d0d MS-647 [monitor] grafana display average cpu-temp
Former-commit-id: e63179b6d3d27a8f9c3cd0103d8b1f6eeba238dd
2019-10-14 13:02:19 +08:00
peng.xu
6b12678f06 Merge branch 'branch-0.5.0' into 'branch-0.5.0'
re-organize project directory

See merge request megasearch/milvus!706

Former-commit-id: 18490c4712a13e55cffd178d00821a70741fb9b7
2019-10-14 12:06:38 +08:00
peng.xu
a671171a8c Merge branch 'branch-0.5.0' into 'branch-0.5.0'
temporarily change sqlite-orm download url to gitlab

See merge request megasearch/milvus!707

Former-commit-id: 92cd2be8831bfceac26d89ca27d0455ca3bd7cd8
2019-10-14 11:56:28 +08:00
zhiru
52f82f976d temporarily change sqlite-orm download url to gitlab
Former-commit-id: 7d46aa017f2d68a9ec70deb743c72c30a8149713
2019-10-14 11:55:02 +08:00
starlord
2fc179104d Merge remote-tracking branch 'source/branch-0.5.0' into branch-0.5.0
Former-commit-id: 7e210e1c775b9acef194ac6f53cf0dc1a671b04d
2019-10-14 11:45:40 +08:00
starlord
994274a130 merge 0.5.0 branch
Former-commit-id: c687efe7864690004aecb296c1b75ce7084eb315
2019-10-14 11:44:56 +08:00
peng.xu
cbb2664807 Merge branch 'branch-0.5.0' into 'branch-0.5.0'
temporarily change sqlite-orm download url to gitlab

See merge request megasearch/milvus!705

Former-commit-id: e84d0cc506ef0cdc9202e5509866cb4b5c4b5988
2019-10-14 11:42:56 +08:00
zhiru
ed767a56be Merge remote-tracking branch 'upstream/branch-0.5.0' into branch-0.5.0
Former-commit-id: fcc4392560b95cb3c32d6488c456a51e7946c6df
2019-10-14 11:41:05 +08:00
zhiru
40186e2ec3 temporarily change sqlite-orm download url to gitlab
Former-commit-id: f5b8bc28955f091fa9003bf7e87e8c5c1167d56e
2019-10-14 11:41:01 +08:00
starlord
004bd81ac8 Merge remote-tracking branch 'source/branch-0.5.0' into branch-0.5.0
Former-commit-id: 4496b80869e6be02b8fbbe92a3ab08f8bf763acf
2019-10-14 09:51:56 +08:00
starlord
41d37f9648 re-organize project
Former-commit-id: 898c2c8b0b2cfdc1b8664062aa0ea910a93566dd
2019-10-14 09:51:48 +08:00
jinhai
711d8f015b Merge branch 'branch-0.5.0-yk' into 'branch-0.5.0'
MS-639 SQ8H index created failed and server hang

See merge request megasearch/milvus!704

Former-commit-id: 7ea975cd9cb71317c70b07471cc0c79bc9723c30
2019-10-13 21:40:09 +08:00
Yu Kun
d482246191 clang format
Former-commit-id: 24a39a20faa3bec8daf8c2ac5764f1856dceb2af
2019-10-13 21:21:29 +08:00
Yu Kun
b429953c0b fix conflicts
Former-commit-id: 421fa7db0f800aec6fef28d55a6dfb80e9308759
2019-10-13 21:18:02 +08:00
Yu Kun
56e6d17549 MS-639 SQ8H index created failed and server hang
Former-commit-id: bb2e5a11210eba6a5f4e3e4299e0e5bd4d8d86cc
2019-10-13 21:14:54 +08:00
Yu Kun
923406da8b MS-639 SQ8H index created failed and server hang
Former-commit-id: f57b0eb2423ee7d99fb58f06a68e828b3273d0f9
2019-10-13 21:14:32 +08:00
Jeff
8be739aeb1 Merge branch 'branch-0.5.0' into 'branch-0.5.0'
format

See merge request megasearch/milvus!703

Former-commit-id: c7486fb1d65dc26501cc65cdfa78d935aa469577
2019-10-13 18:13:09 +08:00
wxyu
07ef5a41bc format
Former-commit-id: 0fde786876ab02f2ed5c162dd5163892e5b796fb
2019-10-13 18:12:19 +08:00
jinhai
0d1d85f4bd Merge branch 'caiyd_reduce_parallel_0.5.0' into 'branch-0.5.0'
MS-606 optimize reduce, update unittest

See merge request megasearch/milvus!694

Former-commit-id: 3a99483a963ebda56d26c6137d70be3511122361
2019-10-13 17:59:25 +08:00
jinhai
0cd2e2a0c9 Merge branch 'branch-0.5.0' into 'branch-0.5.0'
SQ8H in GPU

See merge request megasearch/milvus!701

Former-commit-id: 8ee14aab943cbe9a979787a7169fe6c2f02f0382
2019-10-13 17:59:19 +08:00