2102 Commits

Author SHA1 Message Date
zhiru
14e5c85071 update
Former-commit-id: f90944d80f2155a4971225fcf61f7b50610aa0fe
2019-07-09 04:44:50 +08:00
starlord
1b5953bd0d reduce unittest time cost
Former-commit-id: 0c97f4623a480616b47f18fb0b72cbc33b393b66
2019-07-09 04:44:50 +08:00
yu yunfeng
84e0c5808a MS-151 Fix topk problem
Former-commit-id: 3f9acd4460ebede7883669147194e32f99d72094
2019-07-09 04:44:50 +08:00
yu yunfeng
e2d3935b60 ADD LOG
Former-commit-id: 36614bd9c42406016c746d56482ed987cb9b5bd4
2019-07-09 04:44:50 +08:00
jinhai
a66c229efd Remove unused code
Former-commit-id: a8b9985902792c6b8c884a284fe0fad1c6515b3a
2019-07-09 04:44:50 +08:00
yu yunfeng
0bc554cf77 acc test
Former-commit-id: 6f4f38ad3c53df2c06cc5a3ae5f57d75139a51c4
2019-07-09 04:44:50 +08:00
zhiru
d87d0977fa update
Former-commit-id: 2561c4f4412eb0f52751d1cbc73e47c9b57652d9
2019-07-09 04:44:50 +08:00
zhiru
b787b49799 update
Former-commit-id: bb7cb2df588dc30ead17b5d727099fddb5ee5595
2019-07-09 04:44:50 +08:00
zhiru
3720a6c3e0 update
Former-commit-id: ce55b27987989dda7c1e2dab1f420256f505820c
2019-07-09 04:44:50 +08:00
zhiru
849689dd42 update
Former-commit-id: 8ea7ae4509eb7c6542ccacd925ee5286c2849e00
2019-07-09 04:44:50 +08:00
zhiru
9e8d7e04ca update
Former-commit-id: 7fd5d1f36a59fdaedf0e1fe4892c1e0d88180d16
2019-07-09 04:44:50 +08:00
zhiru
9c9aac92b9 Disable cleanup if mode is read only
Former-commit-id: 2dfd7154e07274db8a06f280217c1c8ce05c0b33
2019-07-09 04:44:50 +08:00
zhiru
e8f4a76c9e Disable cleanup if mode is read only
Former-commit-id: 6283a6ce33c7f88f84a8686c6659771af1069206
2019-07-09 04:44:50 +08:00
xj.lin
015fe06fc4 update...
Former-commit-id: 42b56218b03ac7b8efb479e776ce601e12a45e6c
2019-07-09 04:43:27 +08:00
xj.lin
440e18bb0f MS-137 - Integrate knowhere
Former-commit-id: 67d9be936996437411ac5941c3e322b08a9389bf
2019-07-09 04:26:31 +08:00
xj.lin
92ebfe95d0 update...
Former-commit-id: 6366c5292e1483be5009e46bd273fdb00433fea6
2019-07-08 19:09:18 +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
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
starlord
606ef0b548 new engine
Former-commit-id: 178888a85b0cc0394d429dfeac4300971f65079f
2019-07-07 17:24:53 +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
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
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
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
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
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
zhiru
cba93cf25d Disable cleanup if mode is read only
Former-commit-id: 8e0119a612c7da87f77c27453144d6666896bdf9
2019-07-03 14:27:19 +08:00