admin/milvus
1
0
Fork 0
mirror of https://gitee.com/milvus-io/milvus.git synced 2025-12-30 23:45:28 +08:00
Code Issues Packages Projects Releases Wiki Activity
805 Commits 136 Branches 186 Tags
Commit Graph

583 Commits

Author SHA1 Message Date
zhiru
420fe72133 fix merge conflicts 
Former-commit-id: 3b113299611aac6bf6094315be161f27760d56a6
 2019-06-11 15:43:05 +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
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
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
groot
d019ccc338 automaticlly generate build version infor 
Former-commit-id: 4c8fccc57722bd527e1947590014e07ca110a108
 2019-06-06 10:24:40 +08:00
Xu Peng
baf70e6156 chore(all): update change log 
Former-commit-id: ccd39605c25d169f2bc7eb80e57cf20447b41715
 2019-06-05 21:17:54 +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
07b85d3b38 add ms-59 in changelog 
Former-commit-id: 86e7f0cbbae12051c4c68b2f4ff7741007aed765
 2019-06-05 15:50:39 +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
1f90641697 changelog 
Former-commit-id: 9dc092a8836e7da04966acecece0270467f48959
 2019-06-04 19:36:48 +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
3b9255ab42 Merge branch 'branch-0.2.0' into branch-0.3.0 
Former-commit-id: 9bd79b393566305b6ee9d10961bd316e39204bf1
 2019-06-04 14:10:02 +08:00
jinhai
d40f75e6df Update CMakeLists.txt: add libgpufaiss.a 
Former-commit-id: 75eab2b1a069b6e42d3410543d95b38776a62a43
 2019-06-04 11:58:05 +08:00
jinhai
5554cd0e07 Update CMake files 
Former-commit-id: a67bcb2311cba6bff73597e1e45944992916ce4f
 2019-06-04 11:35:53 +08:00
jinhai
89d22d5927 Still use faiss-1.5.0 and change the URL to customized REPO 
Former-commit-id: e6e1588032030474e755360d806501e6960e9022
 2019-06-04 10:12:10 +08:00
jinhai
3edb147b43 Use master branch of faiss 
Former-commit-id: 65339e9f2ea8e8cb98fe2679498b5e8b33d1f875
 2019-06-03 21:12:41 +08:00
yu yunfeng
e9dac7521f fix CHANGELOG CONFLICTcqqq 
Former-commit-id: da059eb1ab2c0d4dac31e698e47a345b9baf916c
 2019-06-03 15:50:04 +08:00
jinhai
8348415d41 Changelogs updated 
Former-commit-id: 220c49126526199c7f171a3435632b793fdf66d9
 2019-06-03 11:52:53 +08:00
zhiru
f9e58a1247 fix merge conflict 
Former-commit-id: 77581f78fd10b95d15f01a6551e58f547eee0a77
 2019-06-02 14:13:03 +08:00
jinhai
a85966aa98 Update CHANGELOG for 0.2.0 release 
Former-commit-id: db4bf76619bdef8928fe2d7705aecf695d979d3c
 2019-06-02 13:50:09 +08:00
zhiru
9255010439 update 
Former-commit-id: 92abb14e85df1ac55f51082da7bbdf575cb34529
 2019-06-02 12:00:09 +08:00
zhiru
1bc7db125e fix merge conflict 
Former-commit-id: 693ae97543b8240f3bbcdbb54699fbf01fc1161c
 2019-06-02 11:48:06 +08:00