Commit Graph

1640 Commits (7d782dbb9f826492680ee917199f109b5d6bc84a)

Author SHA1 Message Date
zhiru 9c374b09ef update
Former-commit-id: c97dbcbb86c85046a9bc89e69c43c27bcc4b2ded
2019-07-01 20:10:25 +08:00
zhiru 817e8f25ce update
Former-commit-id: 82c11af9305e823256197114c2ddd4c0a2f2e833
2019-07-01 19:59:26 +08:00
zhiru f6cccd3cbc update
Former-commit-id: da15a7f96a251941e8dc8302dc00fcfe05d88784
2019-07-01 19:49:42 +08:00
zhiru b2cdb9e96d update
Former-commit-id: 0b15e2302d0bec551b1215285ff86b5f6cdf71de
2019-07-01 19:40:28 +08:00
zhiru 542a521286 update
Former-commit-id: a86958591283465c24c8114044e646f2e7ebc8a9
2019-07-01 19:37:36 +08:00
jinhai ac03c4b2f0 Merge from branch-0.3.0
Former-commit-id: 07919b5140ff86401df087bc2539402d80897734
2019-07-01 17:47:33 +08:00
zhiru cdc47c3603 test
Former-commit-id: 338d1eb653c2b0726afe3ac19b2d62aefb5b0169
2019-07-01 17:11:33 +08:00
peng.xu 77120a62ab Merge branch 'revert-5f523800' into 'branch-0.3.0'
Revert "Merge branch 'mysql-0.3.0' into 'branch-0.3.0'"

See merge request megasearch/vecwise_engine!144

Former-commit-id: 2fec20a2409c67e50c9081d1e3626d273e20489e
2019-07-01 15:54:07 +08:00
zhiru fb7505cbce update
Former-commit-id: 9c61cc9301b9d92e5919c6ef4d6e0cf2bf0b441a
2019-07-01 15:51:47 +08:00
zhiru 0ac71cbfda update
Former-commit-id: e7df921b0817f1da8c88fd9f0ff143c0232d751f
2019-07-01 15:49:48 +08:00
zhiru.zhu bd96f26583 Revert "Merge branch 'mysql-0.3.0' into 'branch-0.3.0'"
This reverts merge request !143

Former-commit-id: 81a89490f668ae9342eaf1ecc48d1255879e44a6
2019-07-01 15:38:35 +08:00
peng.xu daf9eda97b Merge branch 'mysql-0.3.0' into 'branch-0.3.0'
MS-105 - Add MySQL

See merge request megasearch/vecwise_engine!143

Former-commit-id: c202a0a82d02bff1528db05e6c1b1f9a6788b9bb
2019-07-01 15:32:04 +08:00
zhiru 5c65f2a865 update
Former-commit-id: 2b2dae7736ed5a79b0bc610a1a51fd5361c8d5cb
2019-07-01 15:29:12 +08:00
jinhai ea7aa4f37a Merge branch 'branch-0.3.0' into 'branch-0.3.0'
ignore c sdk

See merge request megasearch/vecwise_engine!142

Former-commit-id: 809d43be5ae1fa827d47952e6b2ba22929001fed
2019-06-30 19:08:28 +08:00
groot 34eb182252 Merge remote-tracking branch 'source/branch-0.3.0' into branch-0.3.0
Former-commit-id: 2d381a99c00923ae2bfe4c798bc97192bd1037a2
2019-06-30 19:07:05 +08:00
groot ea3fdf6603 ignore c sdk
Former-commit-id: 4bb374ff328198226ae3ab78e5901ed6264713e7
2019-06-30 19:07:00 +08:00
peng.xu 68f6af02e3 Merge branch 'mysql-0.3.0' into 'branch-0.3.0'
MS-105 - Add MySQL

See merge request megasearch/vecwise_engine!141

Former-commit-id: cb83d329e08f38d1d53b123a4d38242a412366df
2019-06-30 19:02:01 +08:00
zhiru c659f0fcfb update
Former-commit-id: 64ac42d61ae8aa38599324b5f72e93e66507aa01
2019-06-30 19:00:53 +08:00
peng.xu 9163dd4cb9 Merge branch 'branch-0.3.0' into 'branch-0.3.0'
refine unitest code

See merge request megasearch/vecwise_engine!140

Former-commit-id: 1195a17800573a36e27b6ccf9ed89d1a52f86069
2019-06-30 18:54:54 +08:00
groot 26f182c7af refine unitest code
Former-commit-id: 7a78a5d5bd966d34d9ccd6f52e3b1c533da3a1a0
2019-06-30 18:53:43 +08:00
peng.xu ee3e384a03 Merge branch 'branch-0.3.0' into 'branch-0.3.0'
fix build error

See merge request megasearch/vecwise_engine!139

Former-commit-id: 526da01ddcf4a660f08c3b0a2d0cde22624b6b00
2019-06-30 17:20:02 +08:00
groot 385875e196 avoid unitest hang
Former-commit-id: 97dc514f8f5cec2d6c1bbe85a89241c27a85b6ae
2019-06-30 17:05:46 +08:00
groot 555c31c4ef avoid unitest hang
Former-commit-id: c1a58a96da3554b9e83795df706ba40a8de673a2
2019-06-30 16:42:12 +08:00
groot 8daec65bc5 fix build error
Former-commit-id: 6c270cbb39d3b46a34d970b35166319190b68019
2019-06-30 16:29:29 +08:00
groot 2f12194cc0 fix build error
Former-commit-id: 403ec4922b0d18bec2039da8ca9bc0d944429b84
2019-06-30 16:19:04 +08:00
jinhai 80ccdf18e7 Merge branch 'mysql-0.3.0' into 'branch-0.3.0'
MS-105 - Add MySQL

See merge request megasearch/vecwise_engine!138

Former-commit-id: f4c914178920f93a5136065b2ea19340be3d20d8
2019-06-30 16:09:43 +08:00
zhiru 9e87c4b147 edit server_config.template
Former-commit-id: e88640834e9999cda6eec885cdb91bcaefe1b566
2019-06-30 16:08:56 +08:00
jinhai 109491f22b Merge branch 'mysql-0.3.0' into 'branch-0.3.0'
MS-105 - Add MySQL

See merge request megasearch/vecwise_engine!137

Former-commit-id: 7dfd48be7f8832cfe72065cfd0a74a27b10f634a
2019-06-30 15:59:37 +08:00
zhiru b487aaf789 edit README.md
Former-commit-id: dbfa99efc83ec995a40f24f17d2c4427f612dc71
2019-06-30 15:58:22 +08:00
jinhai b25873ba1f Merge branch 'mysql-0.3.0' into 'branch-0.3.0'
MS-105 - Add MySQL

See merge request megasearch/vecwise_engine!119

Former-commit-id: 2693c3a3163ec5a6bb6801a40fe7983d99862d91
2019-06-30 15:24:47 +08:00
zhiru a365dfda9d update
Former-commit-id: 89a7dcabb06aff4efa21c59e6b3e1ded897f2f53
2019-06-30 15:24:18 +08:00
zhiru e39a522603 update
Former-commit-id: 1c819b89069c8337b233439f00663bf615533577
2019-06-30 15:21:44 +08:00
jinhai 64f01e2c83 Merge branch 'branch-0.3.0' into 'branch-0.3.0'
add more unittest

See merge request megasearch/vecwise_engine!136

Former-commit-id: 6eaff772efc7dc5abdf185c286c5724ce0452b50
2019-06-30 15:21:32 +08:00
groot 01d9689de0 add more unittest
Former-commit-id: 70b143a2a9464ed5d50692e9c093039010bbb060
2019-06-30 15:20:36 +08:00
zhiru f1ccbef06e update
Former-commit-id: ebcc47ee9f40f0616f1b7035f407a787afd39ea0
2019-06-30 15:20:08 +08:00
jinhai 96974f7b1f Merge branch 'branch-0.3.0' into 'branch-0.3.0'
add more unitest

See merge request megasearch/vecwise_engine!135

Former-commit-id: 4cd6d74caae591c3a6d489ad723b4aa796e8a61a
2019-06-30 14:34:00 +08:00
jinhai 5b23b442a3 Merge branch 'origin/branch-0.3.1' into 'branch-0.3.1'
MS-133 Change score to distance

See merge request megasearch/vecwise_engine!134

Former-commit-id: 1e071ddf6096234d368c88dfabcb28a6e371aaee
2019-06-30 14:33:55 +08:00
groot bf41a0a14e add more unitest
Former-commit-id: 569a97813365258f191a5035a52cd6f8671da77c
2019-06-30 14:20:56 +08:00
zhiru 210c801839 update
Former-commit-id: 0eb9b5f027c49b5734411b5ae4ad9e384129a134
2019-06-30 14:05:45 +08:00
jinhai 5cd966ef49 MS-133 Change score to distance
Former-commit-id: f915dd99b33b808b0aa88a23bab8a073c7781289
2019-06-30 13:49:08 +08:00
zhiru 1982887eb2 update
Former-commit-id: 8d5eaf28efc86d4550a9a0bfdc18d15e29c2607e
2019-06-30 13:32:54 +08:00
zhiru f08fb195c7 update
Former-commit-id: 2825bffeb532d4022ea0a36dfa46bba387295598
2019-06-30 13:28:38 +08:00
jinhai 58969d48a8 Merge branch 'branch-0.3.1' of http://192.168.1.105:6060/megasearch/vecwise_engine into branch-0.3.1
Former-commit-id: d456d64d94d7eba0f6d9784ff6b92c24f510f0d6
2019-06-30 13:02:46 +08:00
jinhai fbae790c1b MS-133 Change score to distance
Former-commit-id: 6cb53e9fe988a17c293aa9faee663d5d48c98fc9
2019-06-30 13:02:42 +08:00
jinhai d1008e0435 Merge branch 'branch-0.3.0' into 'branch-0.3.0'
add more unitest

See merge request megasearch/vecwise_engine!133

Former-commit-id: d6a4272a1b1d010e5f1f2aa40f517aebf316ff56
2019-06-30 11:56:20 +08:00
groot 60cd1729d3 add more unitest
Former-commit-id: a97158e5a0c0a719fa4d688f2cc2ef010a15838b
2019-06-30 11:54:57 +08:00
jinhai 62f17aa22e Merge branch 'branch-0.3.1' of http://192.168.1.105:6060/megasearch/vecwise_engine into branch-0.3.1
Former-commit-id: 8b09626aa149077eb8856fc3b2efbf62177c979c
2019-06-30 11:43:03 +08:00
jinhai a7da283961 MS-125 Update version of CMakeLists.txt
Former-commit-id: d5ed815a39ba141d330f374585cc3d95d8462e21
2019-06-30 11:42:56 +08:00
jinhai ecf548b193 MS-125 Update CHANGELOG.md for branch-0.3.1
Former-commit-id: bff247f17e5abd4af7fac412e529e64874ed14a5
2019-06-30 11:42:56 +08:00
zhiru ecb69a2d41 update
Former-commit-id: 888aea4f3e481abd35b2bbd879874a54b3be9d2a
2019-06-30 10:44:22 +08:00