Commit Graph

607 Commits (52e23c4760415705bf986b94565fae28327956de)

Author SHA1 Message Date
yu yunfeng 52e23c4760 merge 0.3.0
Former-commit-id: 9e30f64b77a970d48e627bd5c518a7c17f498fd5
2019-06-14 09:59:28 +08:00
yu yunfeng f30bb1d35d add netio
Former-commit-id: 778661eb22ca5e6e697afe00df3dac4aca416125
2019-06-14 09:23:39 +08:00
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 49c528301c Merge branch 'branch-0.3.0' into 'branch-0.3.0'
MS-80 fix hang issue

See merge request megasearch/vecwise_engine!85

Former-commit-id: 583d6c0a0915be203fa26b235958f6c161075fd4
2019-06-13 16:03:13 +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
jinhai 9c34c92e16 Merge branch 'branch-0.3.0' into 'branch-0.3.0'
MS-81: fix faiss ptx issue; change cuda gencode

See merge request megasearch/vecwise_engine!84

Former-commit-id: 14033f044523fe36dfff5c4c5841b794ed2ffb75
2019-06-13 14:34:04 +08:00
zhiru 83bce35e8c fix faiss ptx issue; change cuda gencode
Former-commit-id: e45b7ae6b90cc3cdbf56dd30a8e9a674a03d0028
2019-06-13 13:20:06 +08:00
groot ff00692666 chnagelog
Former-commit-id: 976eb7fe04f1e66e2501451491cc7dff052fbda7
2019-06-13 10:08:45 +08:00
groot c604eb59a2 fix pipeline crash bug
Former-commit-id: 55fbac7f92ba19ccb23425f8720b29efd65c5728
2019-06-13 10:05:08 +08:00
jinhai be843f84c4 Merge branch 'branch-0.3.0' into 'branch-0.3.0'
MS-75: cmake: change faiss version to 1.5.2; add CUDA gencode

See merge request megasearch/vecwise_engine!80

Former-commit-id: a7ea464c9b193f96a326588cf9a2ce89ecef605f
2019-06-12 19:38:06 +08:00
jinhai 1c4e97e4c1 Merge branch 'branch-0.3.0' into 'branch-0.3.0'
MS-56 Add version information when server is started

See merge request megasearch/vecwise_engine!79

Former-commit-id: 5d3818724e48d1ec742477e7fc300a96ab3f8db6
2019-06-12 11:55:54 +08:00
zhiru 1577ed3502 cmake: change faiss version to 1.5.2; add CUDA gencode
Former-commit-id: 63fea8b09720ced30413b08faea8237939ed41a3
2019-06-12 11:27:50 +08:00
groot 11b32c9d1d version bug
Former-commit-id: aeded6d017202aff19cccd44bb4f7299cbad4d31
2019-06-12 11:11:00 +08:00
zhiru a7b27d3c46 Change README.md in cpp
Former-commit-id: c6ad84a6488350bce6f007df8a9e81ad3817fc88
2019-06-12 11:05:33 +08:00
groot 235b85f63b changelog
Former-commit-id: 6b2099e086696dfbf956e0778d0941ec89bb4812
2019-06-11 16:43:05 +08:00
groot 8b3982916f changelog
Former-commit-id: 307d64c2635cc7cc5efbc973d573ef9d030eec27
2019-06-11 16:41:41 +08:00
groot 3ee722ae85 merge remote branch 0.3.0
Former-commit-id: e7cc89f6bd93693ca0b6501293b91646ef47130d
2019-06-11 16:38:36 +08:00
zhiru 8328391443 cmake: delete civetweb
Former-commit-id: 9433a000ba9da1916ef85288316477069d2019c7
2019-06-11 16:23:55 +08:00
zhiru 2d7b67a06f fix merge conflicts
Former-commit-id: a716e47d046e3cc738f7f4b6a7b7201f57fa0d3a
2019-06-11 15:47:50 +08:00
zhiru 420fe72133 fix merge conflicts
Former-commit-id: 3b113299611aac6bf6094315be161f27760d56a6
2019-06-11 15:43:05 +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 ea01661889 Merge branch 'turnOffRocksDB-0.3.0' into 'branch-0.3.0'
MS-68: Remove rocksdb from third-party

See merge request megasearch/vecwise_engine!73

Former-commit-id: 6c870e6cb1f5434b619485bf4306e3a02fc7bfd4
2019-06-11 14:22:12 +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 25398285e3 Merge remote-tracking branch 'main/branch-0.3.0' into branch-0.3.0
Former-commit-id: 6fec52f1aed006946b3360647d2f3fc727632fb3
2019-06-11 14:10:50 +08:00
yu yunfeng 9cb66ac8d9 fix
Former-commit-id: 00af0b4a367be2dfb26fff09105482364fd56a8e
2019-06-11 14:10:22 +08:00
zhiru 4875bdc4b6 Remove rocksdb from third-party
Former-commit-id: 5f7439e7a2152d5b6b9a8dd82ff54a091ea729ec
2019-06-11 11:47:17 +08:00
zhiru ec9afe5c46 cmake: change prometheus source to git
Former-commit-id: ee0b45452cd7a5d695cabc31ab833b86a05c87ce
2019-06-11 11:41:11 +08:00
zhiru 6c59f66b0d cmake: fix faiss dependency
Former-commit-id: 4f93415c61d67a902972cfde865f2672366282b1
2019-06-11 11:00:41 +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 c74d368640 CHANGELOG
Former-commit-id: 22edc2371e9fc3ca684b271f5d3766cd91c8196b
2019-06-10 19:16:06 +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 3ce05749b2 addd change loig
Former-commit-id: 29f6d2097590a28a0a9adf44b44ad941fa24697f
2019-06-10 15:25:56 +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 cb48a11a90 changelog
Former-commit-id: 30c4ceae2819665e83624722abaa56a891deedca
2019-06-09 15:47:07 +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 0c8eb1a8e6 automaticlly generate build version infor
Former-commit-id: 2998203da61d287b167e5170dbc4f8ec1f315b9a
2019-06-06 10:45:07 +08:00
groot 741c5e90eb automaticlly generate build version infor
Former-commit-id: 7ed02faa146b614ee06327b95a8dba4154a904f9
2019-06-06 10:34:10 +08:00