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 |
|
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
|
619a800766
|
MS-143 merge
Former-commit-id: b8eeda3dcb955a065f4adc933d53c16a10b6f04a
|
2019-07-02 19:28:50 +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 |
|
zhiru
|
c659f0fcfb
|
update
Former-commit-id: 64ac42d61ae8aa38599324b5f72e93e66507aa01
|
2019-06-30 19:00:53 +08:00 |
|
xj.lin
|
d36afb4ae9
|
1. update Cmakemodule to support autodownload knowhere
2. add basic knowhere wrapper and unittest
Former-commit-id: ed32f9e851e014272bbd37f1554c3541ad0740bf
|
2019-06-27 11:04:55 +08:00 |
|
zhiru
|
af07abbcd1
|
change mysql++.so installlation dir to bin/lib
Former-commit-id: 2e62c096c62602697b3d8fc8cddcd4ec00e43d59
|
2019-06-27 11:03:09 +08:00 |
|
zhiru
|
7f24723ec7
|
fix mysql scoped connection concurrency issue
Former-commit-id: ecb3cf07b5f49f2f87e3972a126452ec2950caf8
|
2019-06-26 13:51:56 +08:00 |
|
zhiru
|
31460378fe
|
update
Former-commit-id: 9cc222fbe640ff866444c1dd283535386a2e6fc1
|
2019-06-25 21:09:33 +08:00 |
|
zhiru
|
e5892dbefc
|
Add MySQL
Former-commit-id: b79fe37030a73eb22300c33ff5122a98945daf22
|
2019-06-24 16:44:05 +08:00 |
|
groot
|
ec42c86ecb
|
Merge remote-tracking branch 'origin/branch-0.3.0' into refact
Former-commit-id: 3b55ccd2a1ebb119cdd4a4955bda1cf339936c2b
|
2019-06-20 16:06:52 +08:00 |
|
groot
|
e050719b2b
|
delete table issue
Former-commit-id: d1a8e64086c11081917058623d344ac3c567a74b
|
2019-06-20 16:05:44 +08:00 |
|
jinhai
|
6c836b451f
|
MS-98 Install unit test to installation directory
Former-commit-id: 26e87924a3a67cf766e471af5d7ee4b84de1b191
|
2019-06-19 15:46:14 +08:00 |
|
jinhai
|
d65a7a156b
|
MS-97 Integrate S3 storage sdk and provide storage api
Former-commit-id: 1fa5865169a2673806dad78916b87e3f30de188e
|
2019-06-19 12:04:02 +08:00 |
|
groot
|
1ed0f09d17
|
MS-92 - Unify behavior of debug and release build
Former-commit-id: 190fdf9b47e4eb88e31431b887322f4d5987752c
|
2019-06-18 12:24:36 +08:00 |
|
Xiangyu Wang
|
d35b51f564
|
solve conflict
Former-commit-id: 62294779efb44ed0dc4e248493482d4c7cc3e016
|
2019-06-17 17:56:49 +08:00 |
|
Xiangyu Wang
|
88c7e749b6
|
MS-90 Fix arch match incorrect on ARM
Former-commit-id: b92c6b3ba3109490fa358a9bb123fc7dedea4854
|
2019-06-17 17:52:46 +08:00 |
|
wxyu
|
80e45d14b2
|
MS-89 Fix compile failed
Former-commit-id: 922f2d5105e1ca8c99560b27e51c34d79f5836f2
|
2019-06-17 17:38:33 +08:00 |
|
wxyu
|
f48ffc58a1
|
MS-88 add support for arm arch
Former-commit-id: db52dc345c907874d4fde1c0f048bab3cdc207f5
|
2019-06-17 15:32:25 +08:00 |
|
Xiangyu Wang
|
2aa3975371
|
solve conflicts
Former-commit-id: a3a201d31004f08432c1af0cd15e7db4c3a51119
|
2019-06-17 14:26:46 +08:00 |
|
Xiangyu Wang
|
cc14e2ed59
|
add support arm
Former-commit-id: ecb01d5728e276f2aae6162cf280d1cf959a1235
|
2019-06-17 14:15:07 +08:00 |
|
jinhai
|
7c7adc1452
|
Merge remote-tracking branch 'upstream/branch-0.3.0' into branch-0.3.0
Former-commit-id: e5210820cf606e11fd3cb8fff0b48284b4a690ce
|
2019-06-16 14:12:01 +08:00 |
|
zhiru
|
81b2d9f01e
|
cmake: add arrow, jemalloc and jsoncons third party; default build option OFF
Former-commit-id: 55cfc9b7ac2aa94fab0b6978bfd2d65afaf7de3f
|
2019-06-14 19:10:15 +08:00 |
|
groot
|
d031bb9e26
|
remove old names from source code
Former-commit-id: 3fcd7e5e6d2a8d147f09aa455c4a3f3eab20a24a
|
2019-06-14 17:29:29 +08:00 |
|
zhiru
|
60fc9d24e6
|
cmake: add Arrow, jemalloc and jsoncons
Former-commit-id: 7f4feb5ad2801ba1f4c99967491f1a3f07e1415f
|
2019-06-13 18:12:57 +08:00 |
|
zhiru
|
2d7b67a06f
|
fix merge conflicts
Former-commit-id: a716e47d046e3cc738f7f4b6a7b7201f57fa0d3a
|
2019-06-11 15:47:50 +08:00 |
|
zhiru
|
4e1d514c73
|
fix merge conflicts
Former-commit-id: c6d304468fb8e4ac35a8b16b5090ac0c78d38af7
|
2019-06-11 14:35:44 +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 |
|
yu yunfeng
|
73a1d26e40
|
fix conflict
Former-commit-id: fc062bd7f5818169bd1e3fac750ecf4b016d5d80
|
2019-06-10 15:56:20 +08:00 |
|
yu yunfeng
|
dfda1e2f56
|
fetch from main/branch0.3.0
Former-commit-id: 9058453cf58e85bc177e385c6d465a1d21d80282
|
2019-06-10 14:19:28 +08:00 |
|
groot
|
ff7cab7006
|
refacture db code
Former-commit-id: d232155b1de07bd7b66a64f39417f25118b59891
|
2019-06-09 15:45:43 +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
|
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
|
f8c46af560
|
fix metrics test and add prometheus conf
Former-commit-id: 0c7ff6f49880db0ce4dd22ea1375886fb0e9b03d
|
2019-05-30 14:50:16 +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
|
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 |
|
yu yunfeng
|
439a5d10e9
|
add IO gauge
Former-commit-id: f23a858abade383d61780caf146f5dbbf578a113
|
2019-05-29 19:15:32 +08:00 |
|
groot
|
39df2d4d1e
|
fix third-party link error
Former-commit-id: 54782a2d0812e836544ca8667c1ee42a4e934830
|
2019-05-29 17:30:27 +08:00 |
|
zhiru
|
31a00449a4
|
MS-26 cmake. Add thirdparty packages
Former-commit-id: a68611c035820a429ae5ef1ae104a9826838dcca
|
2019-05-29 16:14:15 +08:00 |
|
zhiru
|
f119cc39db
|
cmake: add thirparty packages
Former-commit-id: f7efb9acd4c01567f8ed6f26a7aa220aa174bb53
|
2019-05-29 12:06:37 +08:00 |
|
yu yunfeng
|
80db8aaf20
|
Fix compile error
Former-commit-id: 07f4dd06011ef519e29744dcd5b8ac9e407b2505
|
2019-05-28 17:50:20 +08:00 |
|
yu yunfeng
|
7839bada77
|
fix conflict
Former-commit-id: 6d3d137cac5d1b8f826cecaeddbd77ad8a635ce2
|
2019-05-28 13:48:37 +08:00 |
|
yu yunfeng
|
1521d0aeb3
|
delete prometheus-cpp
Former-commit-id: d95914cebe38d7f5446cffe28e0d26d0cb82097a
|
2019-05-28 13:36:14 +08:00 |
|