Commit Graph

1395 Commits (8b7273dadbd05645d354aabc16ccecd4b8803096)

Author SHA1 Message Date
quicksilver ad3174a2fb add mysqlcpp cache
Former-commit-id: 11f203c2b2db31eefa3d862fc6796c934751888b
2019-08-01 22:38:45 +08:00
quicksilver 945f5cdc2f MS-306 - Optimize build efficiency
Former-commit-id: a86e15afb113af0aed667a8a99bb164fa8bc00a0
2019-08-01 22:31:30 +08:00
quicksilver 53e59a231b add lz4 cache
Former-commit-id: e1744edbe7fb3a73298aa056cf85892d584883ff
2019-08-01 21:53:12 +08:00
quicksilver dce58c03ea add faiss cache
Former-commit-id: 39d09d89aa0f264fd5861c4dbc4794f90b99e9eb
2019-08-01 21:04:38 +08:00
quicksilver 3c2e45afa4 add lapack cache
Former-commit-id: 24c134fc2ddd18321e2503a2bda6b05e7d457b7e
2019-08-01 20:46:19 +08:00
quicksilver 969f780ff3 add openblas cache
Former-commit-id: c686ffa55a33c18b459cfb659a86ae0badb7782e
2019-08-01 20:42:47 +08:00
quicksilver 932f665a6a add boost & easylogging cache
Former-commit-id: 19e1f06da655df2ad9dee0088e283af5b811a364
2019-08-01 19:03:21 +08:00
quicksilver c5ce84db20 add third party cache function
Former-commit-id: ef521babd2c0a53bb42da74ef57c8ec0dd50d251
2019-08-01 17:34:57 +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
xj.lin 08e0aa836c remove faiss build useless gpu-arch
Former-commit-id: 4c79e50367d25a5336138fe90815d6488ff5244e
2019-07-30 15:34:44 +08:00
xj.lin 9232625a93 replace knowhere with megasearch/knowhere
Former-commit-id: ebc5f2dedbdc9fc7efdeecd8f2457f40829bbb31
2019-07-30 15:18:26 +08:00
xj.lin 7d782dbb9f remove personal project knowhere
Former-commit-id: 9d030089606c110f0a42159fb5200ae2fbbefcc5
2019-07-30 15:12:45 +08:00
zhiru b06cc9fe02 disable mysql unit test
Former-commit-id: 4f07286e00ceabe8fb700206ff45bbdda6bfe8d9
2019-07-30 13:53:45 +08:00
zhiru c16eabb538 disable mysql unit test
Former-commit-id: da61f1ae35c9ed2d8a363ffd2e85dfb634ae4b32
2019-07-30 13:51:59 +08:00
zhiru 6dd6798433 disable mysql unit test
Former-commit-id: cc3158053f3735e701d6c3de940eebeb25abafdd
2019-07-30 13:50:21 +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 5cf5708441 add error handle
Former-commit-id: 54393cf38c6436d7985a2a0fdc8609501fdf2c6a
2019-07-30 10:37:01 +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 aa771e7c3d update knowhere version
Former-commit-id: 0457623ff251b8bb925e289df0b9bf0ee097973c
2019-07-26 10:42:28 +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 99f92d8758 add IndexStatsHelper
Former-commit-id: d47bb68ff89728b31d237a62caa4d4d7673ceb0f
2019-07-24 20:36:35 +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
starlord d7cbf9404a fix unittest unstable case
Former-commit-id: 2cc58215ffb327741e90824fecedf8a3073eebcc
2019-07-24 20:00:14 +08:00
jinhai 27b87309e9 Merge remote-tracking branch 'upstream/branch-0.3.1' into branch-0.3.1
Former-commit-id: e28665f82b62580e41f371ccc4daa4cc6a474c55
2019-07-24 19:59:46 +08:00
jinhai 6acfd7f60d MS-276 Fix compile with volta architecture
Former-commit-id: 5d67c583a462764d368b3d83d337849d54c955f7
2019-07-24 19:59:19 +08:00
starlord a68e501b4b MS-266 Improve topk reduce time by using multi-threads
Former-commit-id: f19c6d78f7f9ab619de792fbb43efd86da0b07a1
2019-07-24 19:48:01 +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 f986af8671 MS-266 Improve topk reduce time by using multi-threads
Former-commit-id: ec370a34b214c9105f06a9bdea8f34728ed5026a
2019-07-24 14:09:06 +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 afc40c454a Merge branch 'branch-0.3.1' into 'branch-0.3.1'
MS-273 Add some logs and reformat code

See merge request megasearch/milvus!270

Former-commit-id: fe9e27aefd9bd73e12dd7aeaf709884b68da9ae6
2019-07-24 11:25:35 +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
xj.lin 7b3886fd23 MS-267 default support IP
Former-commit-id: 64bfb03ea5291604f551530bc65896cc19841a5d
2019-07-24 10:33:41 +08:00
yudong.cai 29a177d129 MS-248 fix profiler build error
Former-commit-id: 817200ab3a01e34553090b8074726ea47f8fd7d8
2019-07-23 17:58:11 +08:00
starlord 07a9fdb8ca MS-246 refine log
Former-commit-id: 87ef7f959b43e92c3e7687f9f8e1d059cc353f79
2019-07-23 15:42:17 +08:00
zhiru 57fd142712 change BUILD_FAISS_WITH_MKL to default off
Former-commit-id: 8cf737578611bf2f05cc4da3a775328e6463d341
2019-07-23 10:42:47 +08:00
zhiru 5d1e887622 Merge remote-tracking branch 'upstream/branch-0.3.1' into branch-0.3.1
Former-commit-id: 643c3e4dbad9a1be34bdf491b93d2a52e463a02e
2019-07-23 10:41:35 +08:00
zhiru 28e84f384d fix metrics
Former-commit-id: 2a7f67913dfdb615e09d7316053c59944132a8fe
2019-07-23 10:41:28 +08:00
xj.lin 813f5151e8 MS-267 Support Inner Product
update..


Former-commit-id: 8fdbb39fbdd05853f25c374f437f3ed78a46345d
2019-07-22 20:12:33 +08:00
peng.xu cdb031e62b Revert "Merge branch 'branch-0.3.1' into 'branch-0.3.1'"
This reverts merge request !264

Former-commit-id: 501e92946ab87fb9a21c55545f84ab8da499e1aa
2019-07-22 20:03:59 +08:00
peng.xu 531978a4b0 Merge branch 'branch-0.3.1' into 'branch-0.3.1'
MS-261: change BUILD_FAISS_WITH_MKL to default off

See merge request megasearch/milvus!264

Former-commit-id: 90a409dec7a99d93f95017e935971558923a997a
2019-07-22 19:44:33 +08:00
zhiru 397d9516f3 change BUILD_FAISS_WITH_MKL to default off
Former-commit-id: 2d61d5e7e25732ed8632d295992ac16378181c37
2019-07-22 18:24:26 +08:00
jinhai 9dc28812b4 Merge branch 'branch-0.3.1' into 'branch-0.3.1'
MS-246 refine log

See merge request megasearch/milvus!263

Former-commit-id: aa0a50e4e47241f55ba430cc6f024e6c473cd923
2019-07-22 17:50:56 +08:00
starlord 5f86066e8d MS-246 refine log
Former-commit-id: d8c30756db5666f964fd4fcf63fdc4a7ab08a4ea
2019-07-22 17:49:11 +08:00
jinhai 7c8b105d0b Merge branch 'branch-0.3.1' into 'branch-0.3.1'
MS-261: change BUILD_FAISS_WITH_MKL to default on

See merge request megasearch/milvus!262

Former-commit-id: ea2f2de479e95449daaa8e928d5594d7bfba5eaf
2019-07-22 17:03:41 +08:00
zhiru f10d8e1b66 change BUILD_FAISS_WITH_MKL to default on
Former-commit-id: 2efee7ecceb466100ea0d875aeb1aeb3dbc02737
2019-07-22 17:02:03 +08:00
xj.lin ba7e3c3dd2 MS-265 IVFSQ
Former-commit-id: 6b0638af562ed60bc2252e4430c1018e29ae857c
2019-07-22 16:37:06 +08:00
starlord add911ae22 MS-249 Check machine hardware during initialize
Former-commit-id: 9f42d9c41dcfac9bc1716737368826bfcd777251
2019-07-22 15:33:36 +08:00
starlord f7742f7281 MS-249 Check machine hardware during initialize
Former-commit-id: 874dcaa8f6000158409de2865ca28050e4ceeac3
2019-07-22 14:25:33 +08:00
kun yu 128b3030da fix some bug for new version
Former-commit-id: 3fb8733f9932f09a986f7693f0f4935a849612c2
2019-07-22 11:30:56 +08:00
peng.xu 4762cbadb3 Merge branch 'branch-0.3.1' into 'branch-0.3.1'
MS-261: update faiss version to 1.5.3 and add BUILD_FAISS_WITH_MKL as an option

See merge request megasearch/milvus!258

Former-commit-id: 2440281de94fe39aaca4a82460eb20b8603266bf
2019-07-22 11:26:24 +08:00
zhiru 0ed96e5f2f fix
Former-commit-id: 162878ec45e3cd98555f08a1d3cf7fc343aa477a
2019-07-22 11:16:14 +08:00
starlord eb1d1e393f MS-249 Check machine hardware during initialize
Former-commit-id: e513499fb015a6867a762a10b629dd774182f21a
2019-07-22 11:15:11 +08:00
yudong.cai 4cff638c30 1. fix bzip2 download url
2. update exception


Former-commit-id: f9f9c4e49933f3e60c7245a886882ca187722cc7
2019-07-22 10:48:32 +08:00
starlord fe63fb509a MS-249 Check machine hardware during initialize
Former-commit-id: 86a0b2945852a9be8fd84422871855702445b7bf
2019-07-22 10:45:13 +08:00
starlord b285c64e96 Check machine hardware during initialize
Former-commit-id: fe3efe3b519235d9579e0c311a7da3f7a299154f
2019-07-22 10:44:24 +08:00
kun yu 4a967676fd Merge remote-tracking branch 'upstream/branch-0.3.1' into branch-0.3.1
Former-commit-id: 59c36121db32e51794f1798160d90287bfb823b7
2019-07-22 10:33:10 +08:00
kun yu 48064dfdee add grpc
Former-commit-id: aee405b98f44290051fe022387c42bcb6d68cc76
2019-07-22 10:14:23 +08:00
zhiru 241320fb50 update faiss version to 1.5.3 and add BUILD_FAISS_WITH_MKL as an option
Former-commit-id: 2156052d9cf246e72168c4490d0b034ad6a00e47
2019-07-21 21:01:53 +08:00
xj.lin 100bdc0d4a update knowhere version
Former-commit-id: 3822bfab27fcaf68ad040615190ab56be725f8b2
2019-07-21 20:47:34 +08:00
zhiru 42b448d9ab update faiss version to 1.5.3 and add BUILD_FAISS_WITH_MKL as an option
Former-commit-id: c3efd4e0515a5145779a2d0fde552520d04e6d01
2019-07-21 20:47:28 +08:00
zhiru e24ae02665 update faiss version to 1.5.3 and add BUILD_FAISS_WITH_MKL as an option
Former-commit-id: 0c26016af4203d4849b8b9b710d005e83e32daea
2019-07-21 20:46:24 +08:00
starlord 9811720ae9 invalid topk
Former-commit-id: 3e5abac60d4c1b029f633f4162e504b543f36357
2019-07-21 18:34:59 +08:00
starlord 30513e6fa5 MS-260 refine log
Former-commit-id: 993f8fc97aba4ff7a696e3c355eccf1b837896c6
2019-07-21 18:03:35 +08:00
xj.lin 651f642d31 MS-259 add exception
Former-commit-id: 8f6b7b9c2e178146d0db55d14a2b716999d8dc0a
2019-07-21 16:10:26 +08:00
starlord f9fb3e36c9 MS-256 - MS-256 - Add more cache config
Former-commit-id: 9c2aad6170f3d2801e7d1a94b35ff04cdfbd2118
2019-07-21 14:11:53 +08:00
starlord e7888afbd3 MS-256 - Add more cache config
Former-commit-id: e65326f81cc7d051a33461af746a6fa8ef1e798c
2019-07-21 14:10:32 +08:00
yudong.cai 30407fef5a MS-257 update bzip2 download url
Former-commit-id: 0c307a4ea79b28ecafac2c9ce91a2525f12bfcca
2019-07-21 11:57:12 +08:00
peng.xu 07e031b085 Merge branch 'branch-0.3.1' into 'branch-0.3.1'
MS-248 update changelog

See merge request megasearch/milvus!242

Former-commit-id: 9acd9b7209f81e36c4b7ee7bcea4a4075eb41549
2019-07-18 17:22:08 +08:00
yudong.cai 24feb5767c MS-248 update changelog
Former-commit-id: cbb78e555685cb4164d37c7b822e5466c9ef28b3
2019-07-18 17:21:04 +08:00
starlord e0b6e66a69 change log size limit to 200MB
Former-commit-id: 6ce00771d20bd1fd18fdf4b4f58ad6f20a6c1bea
2019-07-18 15:35:43 +08:00
starlord 042646c915 fix a typo
Former-commit-id: df6a175ef25ba525c5952d7c3ed26a3aaeb4bf34
2019-07-18 15:11:32 +08:00
starlord 1ee82f8876 fix a typo
Former-commit-id: 8bbbf2d38c2273c646c9b6991536d26d2bd0252b
2019-07-18 15:10:57 +08:00
yudong.cai 4be35eecd6 MS-248 fix build issue
Former-commit-id: 5be81d324326f721d1c4651e064104123fd65026
2019-07-18 11:46:37 +08:00
yudong.cai 15d76b84d4 Merge remote-tracking branch 'main/branch-0.3.1' into branch-0.3.1
Former-commit-id: 5e4bbae09c91b6aebec06951921baa1ea4ac89b5
2019-07-18 11:10:14 +08:00
yudong.cai 4f47b5f7a9 MS-248 support Milvus profiling, bug fix
Former-commit-id: 2375531ff984f2a30f6dd20c2189d469b6922117
2019-07-18 10:27:33 +08:00
yudong.cai f8875429b1 MS-248 support Milvus profiling
Former-commit-id: 1507ffd4cafbd0005a8edb161169f127f1532c04
2019-07-17 20:24:09 +08:00
starlord fd43613935 reduce unittest time
Former-commit-id: aafd3f7417aa6339a67456d9f260a6f55e1b0e8c
2019-07-17 19:53:37 +08:00
peng.xu a72257469b Merge branch 'branch-0.3.1' into 'branch-0.3.1'
MS-245 Improve search result transfer performance

See merge request megasearch/milvus!231

Former-commit-id: e2217255f93e5680d34cfb511cf5aa9ec971f63d
2019-07-17 18:59:49 +08:00
zhiru 606ec47ec5 update knowhere
Former-commit-id: 9ddf5b059cce6c8f5f6e4a8eda38b867992e2621
2019-07-17 18:57:11 +08:00
zhiru d15858e510 update knowhere and fix bug
Former-commit-id: 0b12cc8353bf063ef309b2ffd2bc5f13ebb83634
2019-07-17 18:51:09 +08:00
zhiru 97e452f61e fix
Former-commit-id: 5716472aeaa5679dac13c8e212e279df2960fdea
2019-07-17 18:07:59 +08:00
starlord 476d21927b MS-245 Improve search result transfer performance
Former-commit-id: 77ce402c5ab2c851afa11cb2d637acb69d9ad737
2019-07-17 17:37:42 +08:00
zhiru 07d070ca73 update
Former-commit-id: 1c4f73d9eabbbc3bd085ea0e2cabadf54e4785dc
2019-07-17 13:48:29 +08:00
zhiru eea064a30f update
Former-commit-id: 1c05bc1ae8136ff21aec4c257531a1e9cdbf1fc3
2019-07-17 13:04:30 +08:00
zhiru ab45ad89a1 update
Former-commit-id: aba27ece245cadb9aff24943c957de29c6af2a00
2019-07-17 13:02:40 +08:00
zhiru 596684261d Merge remote-tracking branch 'upstream/branch-0.3.1' into branch-0.3.1
Former-commit-id: 6c32d4b6f798ebcf51a18d4957e9d812380a30ff
2019-07-17 12:53:45 +08:00
zhiru 5acd9ac4eb MS-241 MS-242
Former-commit-id: 608b3d0b14834591a55fca324855b7cbbcf34ca5
2019-07-17 12:50:37 +08:00
xj.lin b6a3f7657a MS-240 fix unitttest build error
Former-commit-id: a8b8dfbc46e01ac2651c74a7b41d0298557eef57
2019-07-17 11:40:09 +08:00
xj.lin 4948e47b67 MS-240 add Log
Former-commit-id: 0f779db21c49adb3d09b1868ac2ee8de00d35bd0
2019-07-17 10:54:04 +08:00
starlord 51ebdb93a9 increse thrift thread count
Former-commit-id: 33cec22bf8733907c7b6d67b5ff8b8cc28a816f7
2019-07-17 10:44:55 +08:00
xj.lin d332dadf9b add some log
Former-commit-id: c5432276b5ade9bb1dce687ea1cfe04840078cbb
2019-07-16 15:25:33 +08:00
starlord 46dbce34ad avoid background merge thread stop
Former-commit-id: cc6ff30a93f8f6afdd662b7459dbb0db63ef45d6
2019-07-16 15:17:20 +08:00
zhiru 585b8401dc fix
Former-commit-id: 8076613c56f3eaa959ef5d21e06933bb09f41889
2019-07-16 11:20:45 +08:00
zhiru 049309f833 fix
Former-commit-id: ebf2ae2d41c259da0e3a22864eb30812b177c2de
2019-07-16 10:25:01 +08:00
zhiru 0b84da5101 Add MySQLMetaImpl::HasNonIndexFiles
Former-commit-id: 9db26bc1ecb99c3522f6a4743da75fc3088fbb5e
2019-07-15 20:41:17 +08:00
zhiru bc5961209b Add MySQLMetaImpl::HasNonIndexFiles
Former-commit-id: 31682c46358678817802ed49dd10327382501c8e
2019-07-15 20:40:03 +08:00
starlord 7b35e2cebe MS-235 Some test cases random fail
Former-commit-id: c77aab33541b0c5da7c3cdc6a080fb47c76bd301
2019-07-15 19:48:11 +08:00
starlord 590efe665a MS-234 Some case cause background merge thread stop
Former-commit-id: 3458b07f4ea8a877cc5ce9739bd5a74daecd1a21
2019-07-15 19:30:24 +08:00
starlord 7d3c60e956 avoid background merge thread stop
Former-commit-id: 9dca4b821b870fa6167ca4e0bab3febe5eb98169
2019-07-15 19:24:20 +08:00
peng.xu a8368f5846 add more logging for bg_error break
Former-commit-id: 3d3ddbe93c0770968d0ac4f86b82c0a94c0fa341
2019-07-15 18:50:56 +08:00
peng.xu 813afe7907 add log before bg_error
Former-commit-id: ab002bc46b2758d4061d5a25ff5f301d0f1516d0
2019-07-15 17:30:13 +08:00
starlord 50e4e8a12f MS-207 build_index return success when table not existed
Former-commit-id: de940fd3aedb6492c85bbd6c6a9fdc04731d7ff9
2019-07-15 15:22:39 +08:00
starlord f3c6559a71 MS-207 build_index return success when table not existed
Former-commit-id: 8e0e1a929afe5959f14c9fbe318303c14d6f8c6d
2019-07-15 14:28:12 +08:00
starlord de09ef53a9 MS-230 - Change parameter name: Maximum_memory to insert_buffer_size
Former-commit-id: 1263b0c2edceb235163c48b34af681c3edb48d16
2019-07-15 13:47:36 +08:00
starlord a01cdbf886 MS-230 - Change parameter name: Maximum_memory to insert_buffer_size
Former-commit-id: 8a27b0b4b272a89a2a1e4e4fa78c26baccaf139d
2019-07-15 13:47:24 +08:00
peng.xu c22290fff8 Merge branch 'branch-0.3.1' into 'branch-0.3.1'
MS-232: add MySQLMetaImpl::UpdateTableFilesToIndex and set maximum_memory to default if config value = 0

See merge request megasearch/milvus!211

Former-commit-id: 516ab28251dac5743734f50f4a325ca6ee923ca5
2019-07-15 12:00:36 +08:00
zhiru 3963c93ded remove mem manager log
Former-commit-id: 886277f2db3f150db9475a9ffe490b0bc6d7fc63
2019-07-15 11:58:02 +08:00
zhiru 50ca5b4bde add MySQLMetaImpl::UpdateTableFilesToIndex and set maximum_memory to default if config value = 0
Former-commit-id: e3dba8250a2b8c28770811e5c202232bb59231c6
2019-07-15 11:37:26 +08:00
zhiru e950fff672 add MySQLMetaImpl::UpdateTableFilesToIndex and set maximum_memory to default if config value = 0
Former-commit-id: f8943149b9737b2f0107308aa96a7f77acdf9ce4
2019-07-15 11:36:01 +08:00
starlord cd9f317747 fix index check error
Former-commit-id: 9b876213adce723cb2da6d4aa40fb33be2a2c54a
2019-07-15 11:10:57 +08:00
jinhai 644d2a4ea4 Merge remote-tracking branch 'upstream/branch-0.3.1' into branch-0.3.1
Former-commit-id: c623a4aba15cdb7e5652ed5029090112ec01e8f1
2019-07-15 10:57:52 +08:00
jinhai e84affaef7 Merge branch 'branch-0.3.1-yuncong' into branch-0.3.1
Former-commit-id: 34512e807e4a3b399f88b3fef50e80483b9896b8
2019-07-15 10:57:03 +08:00
zhiru 4d51f9a122 Return AlreadyExist status in MySQLMetaImpl::CreateTable if table already exists
Former-commit-id: eb56307b2a6613a90df28fba0f63166745195cc3
2019-07-15 10:45:20 +08:00
zhiru 8ca3b33cd8 return AlreadyExist error
Former-commit-id: b80220e68e8a5a53c1a2fef4e90d8a4729a85996
2019-07-15 10:41:22 +08:00
starlord 2dffb947a9 add more unitest cases
Former-commit-id: 6367f0601b449098514ac4770eb72daa81d91607
2019-07-15 10:29:28 +08:00
starlord 2428ff1160 Fix unittest error
Former-commit-id: 9185fecbe5161694c6b741ad53fdccf89857899a
2019-07-15 09:25:55 +08:00
jinhai 98cf0bd1e1 Merge branch 'branch-0.3.1-yuncong' into branch-0.3.1
Former-commit-id: 92f799018746a7b117aa0ec1e4af15b0d13a4c01
2019-07-14 21:13:26 +08:00
starlord 46d64af09c Fix small size index build crash
Former-commit-id: d1255df5fc62aa037f4670049cccfbb8a9851732
2019-07-14 16:46:05 +08:00
starlord db65b9a0b4 Fix unittest error
Former-commit-id: d8dc208227a2904098d899fca71b936a64a528bd
2019-07-14 16:10:17 +08:00
starlord c1b312e257 Fix unittest error
Former-commit-id: 106c17b0afc52ddc577c2bc8262b25dcb23f4902
2019-07-14 16:09:09 +08:00
starlord 753ba5a151 Fix SQ8 row count bug
Former-commit-id: 7cd10610f84b0398b36909d9cc45bcfa2d77487b
2019-07-14 15:18:22 +08:00
jinhai ecedf749a0 Merge branch 'branch-0.3.1-yuncong' into 'branch-0.3.1'
Merge: Add new memory mgr and validation

See merge request megasearch/milvus!200

Former-commit-id: aacab994009e7337f4429a5cf9efe4c690ac0240
2019-07-14 13:11:03 +08:00
starlord eb14bc0d2d Fix SQ8 row count bug
Former-commit-id: 41749a648567e492bc9a718db9526ed98bb2532a
2019-07-14 11:43:14 +08:00
jinhai b19b4031b8 Fix building fault
Former-commit-id: 4b82bd7958672d7762aa667845c9eb63a8da789d
2019-07-14 02:11:32 +08:00
jinhai 8103d78fd5 Fix build fault
Former-commit-id: 1c813d1f13c4bfd36d42ad11f21f1fe1bc827f17
2019-07-14 02:08:56 +08:00
jinhai 7c58bd30a2 Remove redefinition
Former-commit-id: 4dd734c7ebffa9a462c641b0e220a62668651859
2019-07-14 01:54:26 +08:00
jinhai 7afa3e46d0 Merge branch 'branch-0.3.1' into branch-0.3.1-yuncong
Former-commit-id: d2e66733c2cbfda1caa3febcc5e7b69c5bdcc2d9
2019-07-14 01:28:17 +08:00
zhiru 446513f004 update
Former-commit-id: cb170ffdc137c7b897792f092f36438de892d0e8
2019-07-14 00:38:21 +08:00
zhiru 8a1af93518 update
Former-commit-id: 3bda5a0b65c0ddf4bce76685e708ea90c951ad8f
2019-07-14 00:38:21 +08:00
zhiru 034d8a6403 update
Former-commit-id: f2172ed1070f1be0fa525781fb1a70e230ea8258
2019-07-14 00:38:19 +08:00
zhiru 9d80667a72 update
Former-commit-id: 142163d37af3a3aab8aa3466f37651d3315ddef5
2019-07-14 00:37:33 +08:00
zhiru c7d0f49637 fix cmake
Former-commit-id: 70f81e37a82ca2b6e7280d95e65e6c8eb541a577
2019-07-14 00:37:31 +08:00
zhiru 661d1127aa use env variable to switch mem manager and fix cmake
Former-commit-id: 887e191a29d7b88dc646f2d59628e1ca7693841a
2019-07-14 00:35:58 +08:00
zhiru b660b49cb5 use env variable to switch mem manager and fix cmake
Former-commit-id: 30fa1d2ca1721631298ea3233841cc15f45f87f7
2019-07-14 00:35:56 +08:00
zhiru 9d9e46c346 update
Former-commit-id: 45b443d3533ec64f2a029ccdd8cecb1b38142b9b
2019-07-14 00:34:16 +08:00
zhiru 1cf7999f96 Add new mem manager
Former-commit-id: 577ceb1dbbe4b2aa0565f3363a3ca4d495a4f1b6
2019-07-14 00:31:41 +08:00
zhiru 35cd901c3f add mem manager
Former-commit-id: 1efc6fb4b565c7793a8a25904c3e656c6c36762d
2019-07-14 00:27:12 +08:00
zhiru e96bd671c0 Implemented add and serialize
Former-commit-id: 8bcf593791b3f04c055132aec838c439dec9c3a0
2019-07-14 00:22:38 +08:00
zhiru f4b5ae43f6 update
Former-commit-id: 1a16b8b1d26c704dc72282087207390adee03d0b
2019-07-14 00:19:39 +08:00
zhiru ba37fb954c add mem impl
Former-commit-id: 36990028d0a289df532e31e53480dbb16ca0558e
2019-07-14 00:15:50 +08:00
starlord fc74f013a0 add uiittest for merge result functions
Former-commit-id: 810194f590afbd4b4625840875e1447b464011b0
2019-07-14 00:10:51 +08:00
zhiru 33ec9af47b fix changelog
Former-commit-id: 5f5edf4f22a3458d49dd42f65bb888801322b68e
2019-07-14 00:09:31 +08:00
zhiru 79d2d66308 fix changelog
Former-commit-id: 32d04d3eb829ffbd0537a930cff80398f3ea2c85
2019-07-14 00:09:29 +08:00
zhiru a55fef0754 fix c_str error when connecting to MySQL
Former-commit-id: 6c3fe3ff323cd8baa045d00f343bd48de312aa41
2019-07-14 00:08:14 +08:00
zhiru bad5da3b31 update
Former-commit-id: 85a14245eabca8806706a3807e701d0db91fd074
2019-07-14 00:08:08 +08:00
yu yunfeng 1f6a6458b7 MS-151 Fix topk problem
Former-commit-id: ead499ba9f5f152a6c2f9d0c6e2578f6f3a80f8e
2019-07-14 00:08:00 +08:00
yu yunfeng e0a6469f8a ADD LOG
Former-commit-id: f8ce9610b58cedf3505afc956e78b656c2152e31
2019-07-14 00:05:52 +08:00
yu yunfeng e94b70829c acc test
Former-commit-id: 1f6af0b88d5d9d3b70ab5c891e8ce6c3a6f004a1
2019-07-14 00:05:52 +08:00
zhiru 640f3f3917 update
Former-commit-id: c6e3e88df71a755ae3b93df822ad426179a86386
2019-07-14 00:05:47 +08:00
zhiru 46336733ee update
Former-commit-id: 7e7f7df70a19e58f1c65ec487f2c5624e133ee47
2019-07-14 00:05:47 +08:00
zhiru 5a04f56aad update
Former-commit-id: 5232df1758b4041adf936d8df46fe97ff89668cc
2019-07-14 00:05:47 +08:00
zhiru 7e96b554a0 update
Former-commit-id: d5dba29858cecbf0781cad8b02a24de7c7fb080d
2019-07-14 00:05:47 +08:00
zhiru 2dc45d2a7b update
Former-commit-id: d1cdc65f12f76335a7118fb3ebee3df201b26a43
2019-07-14 00:05:47 +08:00
zhiru e095face90 Disable cleanup if mode is read only
Former-commit-id: 99eb96aa039dfc73eb5bef99d9a9416eae5d396e
2019-07-14 00:05:39 +08:00
zhiru 65419a157f update
Former-commit-id: 966c56781878a740a8b31f7aeea99ed4dd562de7
2019-07-14 00:05:37 +08:00
zhiru 48626e338c Add new mem manager
Former-commit-id: 639e28832e5dfb1cdbdbc7a47177520a9ad4f60f
2019-07-14 00:04:58 +08:00
starlord f7e11e873f date range check
Former-commit-id: 20a461530f625d7aa9c4ba14cfc6fbc09b78bf06
2019-07-14 00:04:42 +08:00
jinhai b67500c44b MS-176 Update table name length
Former-commit-id: 261a0a56335e00d72b92c84dcf2a8c4d233f1820
2019-07-14 00:04:42 +08:00
jinhai e28f3397ef MS-176 Add create table parameter check
Former-commit-id: a7bc3606576f90a9e579bb401f65efb4477c036f
2019-07-14 00:04:42 +08:00
zhiru ad4e841664 add mem manager
Former-commit-id: 88ceef178607ea2e49eec64c533959a077c3e4a2
2019-07-14 00:04:42 +08:00
zhiru b6d3c66476 Implemented add and serialize
Former-commit-id: 35a61d2fd0fc9c703ec4efbc9fe8399162e79b8e
2019-07-14 00:04:42 +08:00
zhiru d2f205d148 update
Former-commit-id: 1f59974937316725298b1d328c0a38308a4ce367
2019-07-14 00:04:42 +08:00
zhiru 7d4c2632fb add mem impl
Former-commit-id: d0e652cb4c7454cbe2cf6102622343b5a2eee158
2019-07-14 00:04:42 +08:00
zhiru ed21eb2993 fix changelog
Former-commit-id: 8923ccec2ae5b9334b60c0ac48c3e9ce6e6fbdfe
2019-07-14 00:04:42 +08:00
zhiru 54b0857cb2 fix changelog
Former-commit-id: 9d7996e2d76f39f514ccc257a55f82fedbd20a0f
2019-07-14 00:04:42 +08:00
starlord 6207e83000 add uiittest for merge result functions
Former-commit-id: 071b7cd18d8acbd6bd6bdceb7dae9a7cf1d1a86c
2019-07-14 00:04:40 +08:00
zhiru b4f1e9cbb7 fix c_str error when connecting to MySQL
Former-commit-id: 4546e50abcbad6b8bc5d2cc19e20653672edaa3c
2019-07-14 00:00:40 +08:00
zhiru 1c441df72e fix c_str error when connecting to MySQL
Former-commit-id: 6c7b477cac2330c169a076550553dbba7efd533e
2019-07-14 00:00:40 +08:00
zhiru 107d8efdf2 update
Former-commit-id: 14a8abe10984046f4ca1c38a96ecd5c9c0297cc4
2019-07-14 00:00:40 +08:00
zhiru 434ba458cc update
Former-commit-id: 12267838390a1c152994efe234d79bc74e299f75
2019-07-14 00:00:38 +08:00
starlord 2036586acf reduce unittest time cost
Former-commit-id: b568b26516a7894bf7a69471a3876f8222e2a180
2019-07-13 23:54:35 +08:00
yu yunfeng 854dfeb85b MS-151 Fix topk problem
Former-commit-id: 40f952e4c6e1ed9f5ca3a300601c51d410c8e86b
2019-07-13 23:54:35 +08:00
yu yunfeng f185a8b606 ADD LOG
Former-commit-id: 864d502d90f0b5e1b75da7eee8fcafc9a8c305dd
2019-07-13 23:54:35 +08:00
jinhai e22078a0c3 Remove unused code
Former-commit-id: f6b16666a397b7e6c06f79795874ebd91baabe40
2019-07-13 23:54:34 +08:00
yu yunfeng a954f7a463 acc test
Former-commit-id: 73a1cf40d4227a8e30fa00c43d67f4483592eccb
2019-07-13 23:53:37 +08:00
zhiru 4cfee24995 update
Former-commit-id: 4b5f386c0207addda63030c941df6453e5e0afaa
2019-07-13 23:53:37 +08:00
zhiru 72a1e54acc update
Former-commit-id: 021df2529cba274cabb92b4e6a1cc77186a2ebf5
2019-07-13 23:53:37 +08:00
zhiru 74b0ab8eb9 update
Former-commit-id: 99808a6e2bf44a240b4f72d5e6aa9b72c887c0fa
2019-07-13 23:53:37 +08:00
zhiru 3d2b5006ce update
Former-commit-id: ebe0147420bf01f3efe61b6b64bab27dc1f46acb
2019-07-13 23:53:37 +08:00
zhiru 1ecae09ab9 update
Former-commit-id: 0b1cecd26527c40069ef869028afd977304e34da
2019-07-13 23:53:37 +08:00
zhiru ad606851fa Disable cleanup if mode is read only
Former-commit-id: 8de4aa4c6c81e4d6840441527c164bb26fe948e4
2019-07-13 23:53:37 +08:00
zhiru 24e533a3a3 Disable cleanup if mode is read only
Former-commit-id: 8bb50a5c070e1f8bb7c73191481a476f08ee7281
2019-07-13 23:53:37 +08:00
quicksilver e7ad142a08 setting script file permissions to 755
Former-commit-id: 768f01856137fef36250df7bf3c1158738445c0d
2019-07-13 23:53:37 +08:00
quicksilver dcc04ae5ec setting script file permissions to 744
Former-commit-id: 78ab09c270b127e3ae7855008640618bf2177cc6
2019-07-13 23:53:37 +08:00
quicksilver 28cb8ae507 setting script file permissions to 700
Former-commit-id: d2b4c02d842c34207ca95589436f2e37c3b79705
2019-07-13 23:53:37 +08:00
peng.xu f267b5646f Revert "Merge branch 'integrate_knowhere-0.3.1' into 'branch-0.3.1'"
This reverts merge request !152

Former-commit-id: 96413424d145e007f2a6ce1956b4bc57bd880486
2019-07-13 23:53:37 +08:00
yu yunfeng ca5d12b6e4 change CHANGELOG
Former-commit-id: 3af614370acd069b8af356536ab7a3e47a750aff
2019-07-13 23:53:36 +08:00
yu yunfeng 0d25f30b38 update IVF nprobe
Former-commit-id: d2e93de87f9c8b45551f1453b5c0303508cab0c5
2019-07-13 23:53:15 +08:00
yu yunfeng 6ae16689ff update
Former-commit-id: 4fea994502a6f8930efa1f2d821c1bbaaae9f4e2
2019-07-13 23:53:15 +08:00
yu yunfeng ee4cf853bc add engine config
Former-commit-id: 2255522486d6b5cf2c1ab391c9d70f09c3e64e1c
2019-07-13 23:53:15 +08:00
jinhai a0a83a5de0 Fix typo
Former-commit-id: d5ca33aa338466c319b44a2564bd250a384f0085
2019-07-13 23:53:15 +08:00
yu yunfeng a8c4def666 alter nprobe
Former-commit-id: 6cd1ba96ac2ca3831a022337ba79026db357822c
2019-07-13 23:53:15 +08:00
xj.lin e93892eae3 update README.md
Former-commit-id: 4bceb291ad1c31c02fee159340233ed3a1a1402b
2019-07-13 23:53:15 +08:00
jinhai b1212c58ed Add Milvus EULA
Former-commit-id: 6eee85795efc8ce3bbb2c6ccd04e9bba62af90db
2019-07-13 23:53:15 +08:00
yu yunfeng 3ba3c03a01 Update faiss parameter
Former-commit-id: f8d459c5b34053cee90ea7d0f6d4a6e27284b37e
2019-07-13 23:53:15 +08:00
zhiru b56964f179 update
Former-commit-id: 736501fe9c806903d75ef38140b8c9470ac3adc0
2019-07-13 23:53:15 +08:00
zhiru 925c0d0900 update
Former-commit-id: 2e5ec910257824103ab706b7e71a51ea224acfd4
2019-07-13 23:53:15 +08:00
zhiru a3a14a1f87 update
Former-commit-id: d9c2609d1e78c194cafb3a0db8d10be3c104ac1b
2019-07-13 23:53:14 +08:00
zhiru.zhu 4d83c24bd7 Revert "Merge branch 'mysql-0.3.0' into 'branch-0.3.0'"
This reverts merge request !143


Former-commit-id: 8099ff77584b0af7a8d39d0c6289e8e31b2120c8
2019-07-13 23:52:51 +08:00
zhiru c969a6bbb7 test
Former-commit-id: 99b4a0f5b9ba565d0fe3d2eb7241da45f71691e1
2019-07-13 23:52:15 +08:00
jinhai 3d00521267 MS-133 Change score to distance
Former-commit-id: 8e9e1c59187e046b3c5d85e708c27790140bc950
2019-07-13 23:52:15 +08:00
jinhai aa840917e5 MS-133 Change score to distance
Former-commit-id: b66f48e93fbfe461776055f637b996712c8f5881
2019-07-13 23:51:58 +08:00
jinhai 9a85a17466 MS-125 Update version of CMakeLists.txt
Former-commit-id: f833f8943711f1b4dc2a0fef92f24a5d0a7799ca
2019-07-13 23:50:59 +08:00
jinhai 11e26506b6 MS-125 Update CHANGELOG.md for branch-0.3.1
Former-commit-id: bcea2800679f1ce42ce3b0b08fd4c814d75bbeba
2019-07-13 23:50:59 +08:00
zhiru ee44722729 update
Former-commit-id: 83ee5fefa2ad0646d7c5a61b0491affd3e45fbee
2019-07-13 23:50:59 +08:00
zhiru 63a71e04cb update
Former-commit-id: 9690faeda806fb563ed3c2f7a104e9d77b63f92a
2019-07-13 23:50:59 +08:00
zhiru 763194dc2b update
Former-commit-id: ac5140491b67a1fbbf87e61ef5194e39992796e4
2019-07-13 23:50:59 +08:00
starlord 121fba6e10 ignore c sdk
Former-commit-id: b6e3d44be7bf3db02d855ac75d100aff76e7d255
2019-07-13 23:50:59 +08:00
starlord 5f485d7eaa refine unitest code
Former-commit-id: e7206cd997cff9d4cdab8cf531438468370ebaf2
2019-07-13 23:50:59 +08:00
starlord 0f2f6bed6f avoid unitest hang
Former-commit-id: 3913dca183379d1cb658fc905c6a11d2fdabddcb
2019-07-13 23:50:59 +08:00
starlord 4bd3e1f2da avoid unitest hang
Former-commit-id: 95e1d10cb61ff5f8c7e5b8b38564f2c7ab78865c
2019-07-13 23:50:59 +08:00
zhiru 72877cf3d9 edit server_config.template
Former-commit-id: 288b49e77638b34aa3882f7ba2800de46bb446d8
2019-07-13 23:50:58 +08:00
zhiru 2f19e1ca18 edit README.md
Former-commit-id: 150f84fc982b23a055664e606b0ef22494ad650a
2019-07-13 23:50:43 +08:00
starlord 57cff92d04 fix build error
Former-commit-id: da010fb2e477164a9dcc190839bcd7f9d0980b02
2019-07-13 23:50:43 +08:00
starlord 8ffb89d2d7 add more unittest
Former-commit-id: 853d82c0f7b81579d1332c5f1eb08234bc49a065
2019-07-13 23:50:39 +08:00