460 Commits

Author SHA1 Message Date
jinhai
b749e7ec50 MS-82 Update
Former-commit-id: c8dd35401e0fd15df7f140978e37c7a0e6a363f7
2019-06-13 16:54:49 +08:00
jinhai
b6e51b26be Merge remote-tracking branch 'upstream/branch-0.3.0' into branch-0.3.0
Former-commit-id: f431335445d2c54f939dfd84a8dfdf0e4d2df4a2
2019-06-13 16:04:04 +08:00
jinhai
94612238e5 MS-82 & MS-83 Update vecwise to Milvus
Former-commit-id: 69d1f1b661e6fc7779b4ae3abae60eeb28fa2b04
2019-06-13 16:02:25 +08:00
groot
ebfa05d435 fix hang issue
Former-commit-id: 8e31caee7dc66dfca929f78a55786b5d0e86837d
2019-06-13 15:32:02 +08:00
groot
c604eb59a2 fix pipeline crash bug
Former-commit-id: 55fbac7f92ba19ccb23425f8720b29efd65c5728
2019-06-13 10:05:08 +08:00
groot
3ee722ae85 merge remote branch 0.3.0
Former-commit-id: e7cc89f6bd93693ca0b6501293b91646ef47130d
2019-06-11 16:38:36 +08:00
zhiru
2d7b67a06f fix merge conflicts
Former-commit-id: a716e47d046e3cc738f7f4b6a7b7201f57fa0d3a
2019-06-11 15:47:50 +08:00
groot
db3f0e9ba7 support delete table
Former-commit-id: 3b728c4dfc0b9a6c8803538c89961e4b43c6ca67
2019-06-11 14:54:09 +08:00
zhiru
4e1d514c73 fix merge conflicts
Former-commit-id: c6d304468fb8e4ac35a8b16b5090ac0c78d38af7
2019-06-11 14:35:44 +08:00
jinhai
fd407c9e62 Merge branch 'branch-0.3.0' into 'branch-0.3.0'
MS - 69 add all metrics

See merge request megasearch/vecwise_engine!69

Former-commit-id: 45cf1dc65c7a750ba7001888ac36da6e13b85d94
2019-06-11 14:12:32 +08:00
yu yunfeng
9cb66ac8d9 fix
Former-commit-id: 00af0b4a367be2dfb26fff09105482364fd56a8e
2019-06-11 14:10:22 +08:00
zhiru
ec9afe5c46 cmake: change prometheus source to git
Former-commit-id: ee0b45452cd7a5d695cabc31ab833b86a05c87ce
2019-06-11 11:41:11 +08:00
zhiru
3969cbaf0b cmake: remove redundant libs in src
Former-commit-id: 9d73816a0d20620d54d813d08739855dd4cc9909
2019-06-11 10:39:03 +08:00
groot
24498cd466 fix license check bug
Former-commit-id: 7b0fb269f41dd6c1b3bf415a51e9f97260b8ab80
2019-06-10 19:25:51 +08:00
groot
51c9ffbaaf fix license check bug
Former-commit-id: 69114c03a3482ab0835e209b7c680d9b2a0f684c
2019-06-10 19:16:44 +08:00
yu yunfeng
d279b37e53 conflict
Former-commit-id: b94b2d6f0ab402138d3567e395eb7aa9bd68c325
2019-06-10 19:11:07 +08:00
groot
a2d7a4072c fix license check bug
Former-commit-id: c1ad0e1db515ecc079ecad2bae31209ff70d95fa
2019-06-10 18:38:34 +08:00
yu yunfeng
73a1d26e40 fix conflict
Former-commit-id: fc062bd7f5818169bd1e3fac750ecf4b016d5d80
2019-06-10 15:56:20 +08:00
groot
7da06a7e6f support date range search
Former-commit-id: ec9841b7c586f27afadf90e7c49914850ad4d299
2019-06-10 15:13:26 +08:00
yu yunfeng
dfda1e2f56 fetch from main/branch0.3.0
Former-commit-id: 9058453cf58e85bc177e385c6d465a1d21d80282
2019-06-10 14:19:28 +08:00
yu yunfeng
c55a70dc94 fix codestyle
Former-commit-id: 10caa1a57e07115fd3eab3f3a23eaebda6b8ecf2
2019-06-10 10:33:24 +08:00
groot
8ef34c91f4 return search score
Former-commit-id: 683f5873992e47f5220dbcb3cf7fa0f6dc66e48b
2019-06-09 17:57:11 +08:00
groot
cf94a753d7 return search score
Former-commit-id: e141cb974769ee0e7ee06eb7635eb458622af60c
2019-06-09 17:35:52 +08:00
groot
ff7cab7006 refacture db code
Former-commit-id: d232155b1de07bd7b66a64f39417f25118b59891
2019-06-09 15:45:43 +08:00
groot
a1e652088d refacture db code
Former-commit-id: 4aa8a2bb10b44d9315431a79ec6c140e4735aff5
2019-06-09 09:43:05 +08:00
jinhai
e95f511025 Merge branch '0.3.0-local' into 'branch-0.3.0'
MS-62 Search range to all if no date specified

See merge request megasearch/vecwise_engine!58

Former-commit-id: 32d83f5316df5807efd6129fe3babfd5d2327c0b
2019-06-06 12:15:44 +08:00
groot
d019ccc338 automaticlly generate build version infor
Former-commit-id: 4c8fccc57722bd527e1947590014e07ca110a108
2019-06-06 10:24:40 +08:00
Xu Peng
956f774c62 fix(db): temp fix for files to search
Former-commit-id: f45a0e22708c9e9fc388f3fbe6a40c3e0094dd77
2019-06-05 21:10:53 +08:00
yu yunfeng
6ab97a7314 Merge remote-tracking branch 'main/branch-0.3.0' into branch-1.2
Former-commit-id: fb9ce866c473954800fe47b104eafeae4eab70ce
2019-06-05 15:46:16 +08:00
yu yunfeng
24863f63e5 all metrics are done
Former-commit-id: 68275f6545ac62a28899f4b6bbb687365c52d52e
2019-06-05 15:45:48 +08:00
groot
dfef871f97 rename
Former-commit-id: 0db9006f7f17adcc933984f9b471a9173cd5b97e
2019-06-05 15:41:35 +08:00
groot
326945efa7 use switch case
Former-commit-id: 39b674d81433171cc62f30b75064c1f4daa844f9
2019-06-05 12:33:22 +08:00
groot
ab3c9649c6 search context id
Former-commit-id: 7e8bafac6b78d879edb8a09cd2ffb83c46d44401
2019-06-05 12:29:31 +08:00
groot
db1b37d45c fix problems
Former-commit-id: c90a6834c4848fbaed1a1b0c753979f307db4d27
2019-06-05 12:14:53 +08:00
groot
9a29861e08 Merge remote-tracking branch 'source/branch-0.3.0' into branch-0.3.0
Former-commit-id: 4e94a620e63c51693b555337e990530b9caecf25
2019-06-04 19:33:50 +08:00
groot
22b5b6cbf1 pipeline for loading/searching
Former-commit-id: 93cd16549fcd392de487237df21e2df14ef8321a
2019-06-04 19:32:43 +08:00
jinhai
d40f75e6df Update CMakeLists.txt: add libgpufaiss.a
Former-commit-id: 75eab2b1a069b6e42d3410543d95b38776a62a43
2019-06-04 11:58:05 +08:00
yu yunfeng
e9dac7521f fix CHANGELOG CONFLICTcqqq
Former-commit-id: da059eb1ab2c0d4dac31e698e47a345b9baf916c
2019-06-03 15:50:04 +08:00
yu yunfeng
05ab76473d fix CHANGELOG conflict
Former-commit-id: df8811e4af39e2fead9b0923928d10703fbd25cb
2019-05-31 18:38:00 +08:00
yu yunfeng
8367c9aaa7 add vps qeury_summary metircs
Former-commit-id: ec3f9e3dd9338332d2e40dbae8b5d4b672b1cef1
2019-05-31 18:26:44 +08:00
xj.lin
502f1a956c MS-27 support gpu config
Former-commit-id: 08749b66413000571d733a28303eed3944220a9b
2019-05-31 18:25:06 +08:00
yu yunfeng
2ab5e246ac add metrics
Former-commit-id: d7acd398be8aeee11de3f972d9bcf6e84df39358
2019-05-31 14:36:36 +08:00
yu yunfeng
2b472a3340 fix CHANGELOG CONFLICT
Former-commit-id: 22222b13fe56975a13b45066b1b7b721d124729c
2019-05-30 15:13:29 +08:00
yu yunfeng
f8c46af560 fix metrics test and add prometheus conf
Former-commit-id: 0c7ff6f49880db0ce4dd22ea1375886fb0e9b03d
2019-05-30 14:50:16 +08:00
groot
f681c3ae86 restruct thrift package
Former-commit-id: d02f846e4ffa3c61d860b081054d4526e03eb930
2019-05-30 10:02:17 +08:00
groot
168ac46cdb fix thrift generate error
Former-commit-id: 444233484091fe329e190a5fd62bf93c5e26e3f4
2019-05-30 09:24:14 +08:00
yu yunfeng
4193b2e305 Merge remote-tracking branch 'main/branch-1.2' into branch-1.2
Former-commit-id: 3ec3ca22cca08e517779bc268c535d5edd8768fe
2019-05-29 19:23:32 +08:00
zhiru
9d79dd851f Merge remote-tracking branch 'upstream/branch-1.2' into branch-1.2
Former-commit-id: f89f423b90a8c26732b8e7728fa5ae5688d968a3
2019-05-29 19:19:19 +08:00
zhiru
12aa730645 Merge remote-tracking branch 'upstream/branch-1.2' into branch-1.2
Former-commit-id: 45a2bc5528231149db971aabd82d054a71f40df5
2019-05-29 19:18:10 +08:00
zhiru
bc14a2e2f5 MS-31 cmake: add prometheus
Former-commit-id: b26ad79afe4745afea0c802f23f1d9725c8d4747
2019-05-29 19:17:39 +08:00