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
zhiru
cba93cf25d
Disable cleanup if mode is read only
...
Former-commit-id: 8e0119a612c7da87f77c27453144d6666896bdf9
2019-07-03 14:27:19 +08:00
zhiru
f00ca24f1b
Disable cleanup if mode is read only
...
Former-commit-id: 09655e2bb8a52466c1732c829519742867cf07a3
2019-07-03 14:25:02 +08:00
jinhai
f15f796319
Merge branch 'integrate_knowhere-0.3.1' into 'branch-0.3.1'
...
Integrate knowhere 0.3.1
See merge request megasearch/milvus!152
Former-commit-id: 325e321d4d937b6aa108317aee09aedea59207e4
2019-07-03 11:54:21 +08:00
xj.lin
88110a0d65
update ...
...
Former-commit-id: 6b721737d082237cd84128228d187f7b0a336d9b
2019-07-03 11:53:42 +08:00
xj.lin
00acbd9ff6
update R
...
Former-commit-id: 668ee056c2b0de6a56465be8fb78f910935c0e5c
2019-07-03 11:50:47 +08:00
xj.lin
1c3c8b1c1b
Merge remote-tracking branch 'upstream/branch-0.3.1' into integrate_knowhere-0.3.1
...
Former-commit-id: 21f32dea9d0f0a703248422758494bb87f621124
2019-07-03 11:28:42 +08:00
jinhai
960d1c5a80
Merge branch 'branch-0.3.0' into 'branch-0.3.1'
...
MS - 147 Enable IVF
See merge request megasearch/milvus!151
Former-commit-id: c3c997bd086aaba798fb0ef77a4a46e7dc0c0017
2019-07-03 11:23:21 +08:00
yu yunfeng
81e13fd1cb
change CHANGELOG
...
Former-commit-id: f1b0bebcca37b9fb33efc3faea4b9db66a9a4a7e
2019-07-03 11:18:34 +08:00
yu yunfeng
3083d4cd5e
Merge remote-tracking branch 'main/branch-0.3.1' into branch-0.3.0
...
Former-commit-id: dd7b9d0fb8c176d194f213d2ae3e142b5de35f0f
2019-07-03 11:15:43 +08:00
yu yunfeng
4aabe33207
update IVF nprobe
...
Former-commit-id: 41aa77c14de1db37cfb1a177ba223de90829e003
2019-07-03 11:09:17 +08:00
jinhai
feded929ce
Merge branch 'branch-0.3.0' into 'branch-0.3.1'
...
MS - 144 Add engine conf
See merge request megasearch/milvus!150
Former-commit-id: a035448700a96fc317f4ba43df89a521bfdf23c9
2019-07-02 20:51:22 +08:00
yu yunfeng
380363f477
update
...
Former-commit-id: 99f1f53c6f2b1775f78acf0ba5560a112c68140b
2019-07-02 20:24:41 +08:00
yu yunfeng
87af3d632d
add engine config
...
Former-commit-id: 326501e3adc70b88fe3b8304ba39920fb11cf2d0
2019-07-02 20:13:10 +08:00
yu yunfeng
9e56b536f7
Merge remote-tracking branch 'main/branch-0.3.1' into branch-0.3.0
...
Former-commit-id: 79032b111a24180ed2f3a3f7ca5b1ce04a1537bc
2019-07-02 20:11:00 +08:00
jinhai
c480cb8b7f
Fix typo
...
Former-commit-id: 1bccdd0999347c1fa76bdef446e9a7a2109ef66a
2019-07-02 20:06:00 +08:00
xj.lin
3d9a0df2bd
update README.md
...
Former-commit-id: e28550bbbf254514b93e318a7aa8798274e5e55d
2019-07-02 19:58:15 +08:00
yu yunfeng
543f25b266
change changelog
...
Former-commit-id: 375be008b39b71b266febdcf5c3e389c270cb8a0
2019-07-02 19:41:02 +08:00
yu yunfeng
3fda33ac0b
alter nprobe
...
Former-commit-id: 21cc3f6523580303bf702f7e616bcee7416a053f
2019-07-02 19:36:06 +08:00
xj.lin
619a800766
MS-143 merge
...
Former-commit-id: b8eeda3dcb955a065f4adc933d53c16a10b6f04a
2019-07-02 19:28:50 +08:00
xj.lin
640999c0a1
Merge branch 'add_submodule_knowhere' of 192.168.1.105:xiaojun.lin/vecwise_engine into add_submodule_knowhere
...
Former-commit-id: b591518581dafe050de9603b8c5089d5c649e5ed
2019-07-02 18:40:33 +08:00