Commit Graph

1216 Commits (d13b244a466fdc2e1fe6bb2dcfedde7baff815b9)

Author SHA1 Message Date
zhiru a951dd14c0 Add new mem manager
Former-commit-id: abab1d1c2cf67f49a4d9dcf2304df1abed675dda
2019-07-08 11:14:28 +08:00
starlord 0d725b82aa update knowhere
Former-commit-id: 26cefdfab21d0bf5350b2a44263d6f0e58a69768
2019-07-08 10:02:39 +08:00
starlord 1410dc8695 fix build error
Former-commit-id: b32b8705608b064a0209be5c8012e5a5d58c1b93
2019-07-08 09:42:54 +08:00
jinhai 9ec9b3fc26 Merge branch 'branch-0.3.1' into 'branch-0.3.1'
date range check

See merge request megasearch/milvus!167

Former-commit-id: dfb0d6942890fc82a3a7270b7aae627683e0eb0e
2019-07-07 20:43:46 +08:00
starlord fbb25fa910 date range check
Former-commit-id: ff8d7ece23d92d377febdf1eab0b1fbd77048c88
2019-07-07 20:41:52 +08:00
starlord 57ec2e5669 new engine
Former-commit-id: 4718ebf7b53b3ad523bf9318a26d3389ce0c311b
2019-07-07 20:21:38 +08:00
starlord 8edaff9517 new engine
Former-commit-id: 8f84ec8cbe26733b730528b49ae76c9ea158d359
2019-07-07 20:20:30 +08:00
jinhai 522ebd5787 Merge branch 'branch-0.3.1' into 'branch-0.3.1'
MS-176 Add create table parameter check

See merge request megasearch/milvus!166

Former-commit-id: 2d0f1403220723c6e19c861c67a6ec5609de1e86
2019-07-07 19:55:35 +08:00
jinhai 3c851370ac MS-176 Update table name length
Former-commit-id: 76a6e9ccfe4c148a2e9fea81b98e0375be6e3c0e
2019-07-07 19:55:16 +08:00
jinhai fedc8adc51 MS-176 Add create table parameter check
Former-commit-id: 7b42e581b012853673ec4df3423fbea62f61777a
2019-07-07 19:16:39 +08:00
starlord 606ef0b548 new engine
Former-commit-id: 178888a85b0cc0394d429dfeac4300971f65079f
2019-07-07 17:24:53 +08:00
zhiru 6a6722a71c add mem manager
Former-commit-id: c9d77a1d0e9df6679c90fddefee22123cfb0acac
2019-07-07 13:50:39 +08:00
jinhai d05ae97f7e Merge branch 'branch-0.3.1' into 'branch-0.3.1'
MS-161 - Add CI / CD Module to Milvus Project

See merge request megasearch/milvus!165

Former-commit-id: ac5d99c64a139a3e1be1abc602e4c62f20a230be
2019-07-05 18:21:39 +08:00
quicksilver 9ec7b773c3 MS-161 - Add CI / CD Module to Milvus Project
Former-commit-id: 16869771664aeea633d14f2db05c7a6fb8441e64
2019-07-05 18:07:40 +08:00
jinhai eac447298b Merge branch 'branch-0.3.1' into 'branch-0.3.1'
MS-157: fix changelog

See merge request megasearch/milvus!163

Former-commit-id: 27137349970e5334b0e4262084637eb6085fbe2a
2019-07-05 16:54:24 +08:00
zhiru 9f38b96edd Implemented add and serialize
Former-commit-id: 25fbbc2185efc4b45ea8f4693fea0ba0001d267e
2019-07-05 16:46:15 +08:00
zhiru 8f42ef678d update
Former-commit-id: b5c019432679df7fcdf3aacd0e061ee91ddf9609
2019-07-05 15:57:49 +08:00
zhiru 172cd21daf add mem impl
Former-commit-id: 074f1ade11572923ddee2653c26ce6a143001b3c
2019-07-05 15:03:40 +08:00
zhiru 60647624b2 Merge remote-tracking branch 'upstream/branch-0.3.1' into branch-0.3.1
Former-commit-id: 194ecd448af946120b58f2de72b47dcc2b38080f
2019-07-04 18:12:43 +08:00
zhiru b88314c680 fix changelog
Former-commit-id: 56acf5034ef3cf2c07146684d72a19ada980d69f
2019-07-04 17:17:09 +08:00
zhiru f63c389962 fix changelog
Former-commit-id: 6e353ed65ec462256e4787e41b4716975dfd5a4c
2019-07-04 17:15:38 +08:00
jinhai ae714acad6 Merge branch 'branch-0.3.1' into 'branch-0.3.1'
MS-156 add uiittest for merge result functions

See merge request megasearch/milvus!162

Former-commit-id: 1ace40f56245f946229b2f4e7e4063db870b2110
2019-07-04 17:01:40 +08:00
starlord f8cdf0786b add uiittest for merge result functions
Former-commit-id: 0ad3ac4b08e06a1c64249aea05f0c62efa3fe57a
2019-07-04 16:58:40 +08:00
jinhai 692feaacdc Merge branch 'integrate_knowhere-0.3.2' into 'branch-0.3.2'
MS-154

See merge request megasearch/milvus!161

Former-commit-id: 0eab9f44ffb05836139eadfc2c2945f158bde434
2019-07-04 16:17:26 +08:00
xj.lin f7287d74ea MS-154
1. Add Submodule knowhere and specify branch
2. Integrate Knowhere, update many cmakelist
3. dev knowhere-wrapper
4. dev knowhere-wrapper unittest


Former-commit-id: 783a85562b2b5db3b89920b0c68de133a577f245
2019-07-04 16:15:30 +08:00
jinhai 88ec246e4d Merge branch 'branch-0.3.1' into 'branch-0.3.1'
MS-153 : fix c_str error when connecting to MySQL

See merge request megasearch/milvus!160

Former-commit-id: 53865281ef8b8a1c1881b7ccab6b71fc58553e00
2019-07-04 16:01:10 +08:00
zhiru 43d90c2045 fix c_str error when connecting to MySQL
Former-commit-id: 2575292b943cdd9d4035492b78616f7be5f060f3
2019-07-04 15:58:38 +08:00
zhiru 10880b0288 fix c_str error when connecting to MySQL
Former-commit-id: c17d2ed43291d54dd0c1b29b222dae5505c98105
2019-07-04 15:58:28 +08:00
jinhai 0e429a7621 Merge branch 'branch-0.3.1' into 'branch-0.3.1'
MS-152 : Delete assert in MySQLMetaImpl and change MySQLConnectionPool impl

See merge request megasearch/milvus!159

Former-commit-id: cba45fd5fc502a02984cbbeee214ee48e81f2d4c
2019-07-04 14:48:45 +08:00
jinhai f576b349ec Merge branch 'branch-0.3.1' into 'branch-0.3.1'
reduce unittest time cost

See merge request megasearch/milvus!158

Former-commit-id: da369fc7b5c2c48c2320a0deb845c75b85c6825a
2019-07-04 14:47:55 +08:00
zhiru 45eaa66b59 update
Former-commit-id: 660919641b476988d86b5db64d190192bb3c2ffe
2019-07-04 14:20:59 +08:00
zhiru cf8ee20f20 update
Former-commit-id: 31aeb1f531676aeb9e9655a169a80ff508f6ae00
2019-07-04 14:04:57 +08:00
starlord 0b2721dd7d reduce unittest time cost
Former-commit-id: 55e4eb5912766465cb3cd864994f71c08fd971a9
2019-07-04 13:02:47 +08:00
jinhai 90692fe3b4 Merge branch 'branch-0.3.0' into 'branch-0.3.1'
MS - 151 Fix merge bug

See merge request megasearch/milvus!157

Former-commit-id: 8225530a06476b12858ef1cce62c5130e6296980
2019-07-04 12:43:49 +08:00
yu yunfeng 45c172543f MS-151 Fix topk problem
Former-commit-id: eeac049095172303c32f4f26ee13b9c8724870b0
2019-07-04 12:41:24 +08:00
yu yunfeng 55afa772d3 ADD LOG
Former-commit-id: 282768be582212cd6bf364ea1903a9ad716106c0
2019-07-03 20:59:36 +08:00
jinhai 6092b1be99 Remove unused code
Former-commit-id: 5be2fd19cb451599de0c242b9023c5a15b45e204
2019-07-03 20:23:21 +08:00
jinhai 1f6bc4ee7a Merge branch 'branch-0.3.1' into 'branch-0.3.1'
MS-148, MS-149: Disable cleanup if mode is read only and fixed searching only one index file issue in distributed mode

See merge request megasearch/milvus!153

Former-commit-id: fcd22551d6b7b588745386b885bd9dafc1a22307
2019-07-03 20:15:37 +08:00
yu yunfeng 7512cc1e06 acc test
Former-commit-id: a7803568fa785d403e7c92b83c66f9f47f7c8f13
2019-07-03 20:07:11 +08:00
zhiru 2586e4bf6e update
Former-commit-id: 68476662b5f24c76c79ec63f6a9dd556e3008f74
2019-07-03 18:44:29 +08:00
zhiru 788502892c Merge remote-tracking branch 'upstream/branch-0.3.1' into branch-0.3.1
Former-commit-id: b73251efaafaadea801c052f1598f82e3c5852cc
2019-07-03 18:32:27 +08:00
zhiru ff9a3140c5 update
Former-commit-id: 2543b4f174931936a829eba157aec1fab6c0ef84
2019-07-03 18:31:45 +08:00
zhiru fd6d77d627 update
Former-commit-id: eb53fcbf6029d7c061d5c87835700b14a1213e63
2019-07-03 17:24:36 +08:00
quicksilver 87a1f4838d setting script file permissions to 755
Former-commit-id: 421486f834d6c65215fca89572b3327f6dcbcac5
2019-07-03 16:35:19 +08:00
quicksilver 8b71d45ac7 setting script file permissions to 744
Former-commit-id: ba085a62f7a15665cdfa5a481c9470ecdda66d1e
2019-07-03 16:11:18 +08:00
zhiru 0b003144a5 update
Former-commit-id: b75d6fad2d4165cc08ea1b528a9cff36791344b1
2019-07-03 16:04:00 +08:00
quicksilver ad6e164e19 setting script file permissions to 700
Former-commit-id: c14d9e457795129f684cf9e25baa6e0a9f39ad8f
2019-07-03 15:54:15 +08:00
zhiru e89f9b18c1 update
Former-commit-id: b8255e6455c40e0ee843a56787502b65312b2a4a
2019-07-03 15:48:21 +08:00
peng.xu ea9fdbd817 Merge branch 'revert-278f9085' into 'branch-0.3.1'
Revert "Merge branch 'integrate_knowhere-0.3.1' into 'branch-0.3.1'"

See merge request megasearch/milvus!154

Former-commit-id: 4143ee648f606b4a49ccecb25ab51cd2904918a6
2019-07-03 15:18:01 +08:00
peng.xu 697427e7ea Revert "Merge branch 'integrate_knowhere-0.3.1' into 'branch-0.3.1'"
This reverts merge request !152

Former-commit-id: 739bf84961e2d6daa2ebbe2f45882efd2acaa89f
2019-07-03 15:17:28 +08:00