zhiru
|
18bd963462
|
update changelog
Former-commit-id: d751122297499c3ce581cb757285b2a3896046ca
|
2019-05-30 10:18:34 +08:00 |
|
zhiru
|
342e969be2
|
Merge remote-tracking branch 'upstream/branch-1.2' into branch-1.2
Former-commit-id: e93143498c1d4374d5a0879613788b77b40a96af
|
2019-05-30 10:14:09 +08:00 |
|
zhiru
|
a096e52826
|
cmake: add -j4 to make third party packages build faster
Former-commit-id: c8ce2a8cbcf0d610304131e244d5d5000b4c8645
|
2019-05-30 10:12:52 +08:00 |
|
groot
|
f1bb41d34c
|
restruct thrift package
Former-commit-id: 57d8eba6ad2df54f7b2d4e0544157788fe1eb127
|
2019-05-30 10:06:22 +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 |
|
jinhai
|
fc21578f24
|
Build: make -j 4
Former-commit-id: 2726bed199c8921f1ba6850777125d609790841e
|
2019-05-30 09:20:47 +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 |
|
jinhai
|
ee8d81003c
|
Merge branch 'branch-1.2' into 'branch-1.2'
MS-31 cmake: add prometheus
See merge request megasearch/vecwise_engine!44
Former-commit-id: eb497b9737c8b4165aca3490db2315d1791f11a1
|
2019-05-29 19:22:27 +08:00 |
|
zhiru
|
0b0bcb0a2c
|
add changelog
Former-commit-id: 96dc9ec82689e827996cf05e3c78f37fa24e75d8
|
2019-05-29 19:20:58 +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 |
|
jinhai
|
8927a616d5
|
Merge branch 'branch-1.2' into 'branch-1.2'
MS-30 use faiss 1.5.2
See merge request megasearch/vecwise_engine!43
Former-commit-id: fb338b1145cbb745f17ade9ed1a54397cfc90aac
|
2019-05-29 19:18:44 +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
|
e509d29df3
|
use faiss 1.5.2
Former-commit-id: cae61443fe5fb47752e94b19f03a32f3b80ad2f1
|
2019-05-29 18:52:55 +08:00 |
|
groot
|
9f75c8d2aa
|
use faiss 1.5.2
Former-commit-id: 3005f905b39d72ef0018151d7e704023657083c6
|
2019-05-29 18:51:21 +08:00 |
|
jinhai
|
24b3da9fdb
|
Merge branch 'branch-1.2' into 'branch-1.2'
MS-29 fix third-party link error
See merge request megasearch/vecwise_engine!42
Former-commit-id: 37027de76b885d75195431545a7eea6424b0b2ec
|
2019-05-29 17:35:56 +08:00 |
|
groot
|
39df2d4d1e
|
fix third-party link error
Former-commit-id: 54782a2d0812e836544ca8667c1ee42a4e934830
|
2019-05-29 17:30:27 +08:00 |
|
jinhai
|
442c66fd0f
|
Merge branch 'branch-1.2' of http://192.168.1.105:6060/megasearch/vecwise_engine into branch-1.2
Former-commit-id: 316de4cdf7f7daa5e4a01881e7ea5461e10d45aa
|
2019-05-29 17:16:21 +08:00 |
|
jinhai
|
08da9771da
|
Fix Compile error
Former-commit-id: c8568b9dde298251cbff5fc1e58d61c022e13efc
|
2019-05-29 17:16:14 +08:00 |
|
jinhai
|
7bf3895cd8
|
Merge branch 'branch-1.2' into 'branch-1.2'
MS-21 implement sdk interface part2
See merge request megasearch/vecwise_engine!40
Former-commit-id: 797fb1f6ebbe939ff8c5aa5a132e3f6c96c7bdc2
|
2019-05-29 17:04:17 +08:00 |
|
groot
|
a7fed267ee
|
remove thrid-party
Former-commit-id: c44038e6c6c4f593529956d62afead726abe3334
|
2019-05-29 17:02:19 +08:00 |
|
groot
|
845b927783
|
modify changelog
Former-commit-id: 5988d25b5854c502f2496d0244be5313e5a2969e
|
2019-05-29 16:59:51 +08:00 |
|
groot
|
c9f9991ef3
|
modify changelog
Former-commit-id: c7448a91938c65c997df94c0929e4dfb53bb19a6
|
2019-05-29 16:29:08 +08:00 |
|
jinhai
|
46eb246e20
|
Merge branch 'branch-1.2' into 'branch-1.2'
MS-26 cmake: add thirparty packages
See merge request megasearch/vecwise_engine!38
Former-commit-id: 74b99445d3e68c24f298a91934c4319af7901b01
|
2019-05-29 16:25:42 +08:00 |
|
zhiru
|
d601408b08
|
resolve merge conflicts
Former-commit-id: 47eee4d08cde0e6628cddff77de7809ebb486eaf
|
2019-05-29 16:24:46 +08:00 |
|
zhiru
|
9b2d62631d
|
resolve merge conflicts
Former-commit-id: 31d8d0d07a1fb4d8299f694db44787ceacf8c2d3
|
2019-05-29 16:23:24 +08:00 |
|
groot
|
397457112b
|
refine sdk code
Former-commit-id: 30ab87ccf76dadf9c65489d5a19c1134124faec5
|
2019-05-29 16:21:22 +08:00 |
|
zhiru
|
31a00449a4
|
MS-26 cmake. Add thirdparty packages
Former-commit-id: a68611c035820a429ae5ef1ae104a9826838dcca
|
2019-05-29 16:14:15 +08:00 |
|
yu yunfeng
|
9f33297b6e
|
delete irrelavent files
Former-commit-id: 52ab1e2826f26b1be92742124d1ac01a771b7114
|
2019-05-29 16:09:05 +08:00 |
|
jinhai
|
99625929fa
|
Merge branch 'disable-Prometheus' into 'branch-1.2'
MS-25 diable Prometheus
See merge request megasearch/vecwise_engine!41
Former-commit-id: 0ae8e03a63c005e82a601e8164102ac58da31ad1
|
2019-05-29 16:08:58 +08:00 |
|
xj.lin
|
40ec2d90b1
|
MS-25 diable Prometheus
Former-commit-id: 88974da9099e9f3f5d73c923abd29622acd0bd1c
|
2019-05-29 16:05:02 +08:00 |
|
groot
|
5386d5e70e
|
refine sample code
Former-commit-id: 18bda8e3585dfd0bcfc699c6788a9af0eb53fc5f
|
2019-05-29 14:55:22 +08:00 |
|
zhiru
|
f119cc39db
|
cmake: add thirparty packages
Former-commit-id: f7efb9acd4c01567f8ed6f26a7aa220aa174bb53
|
2019-05-29 12:06:37 +08:00 |
|
jinhai
|
360d56fd48
|
Merge branch 'branch-1.2' into 'branch-1.2'
MS-21 implement sdk interface part2
See merge request megasearch/vecwise_engine!37
Former-commit-id: c4d647fa9fb4714b889fc05a82348c7984a39e8f
|
2019-05-29 11:39:00 +08:00 |
|
groot
|
369ce2d76d
|
fix typo
Former-commit-id: b83788e0c11efa77b74a953cfd3b85432c85d5c3
|
2019-05-29 11:24:30 +08:00 |
|
groot
|
de1d9fb655
|
fix some bugs
Former-commit-id: 297b63106e0ed450d92017ca0b079798a43909c5
|
2019-05-29 11:22:12 +08:00 |
|
groot
|
61fb59d23b
|
merge from remote source
Former-commit-id: fc7be69bc0d039576469f0adb81e027a8f00272c
|
2019-05-29 09:15:12 +08:00 |
|
jinhai
|
5323a04003
|
Merge branch 'branch-1.2' into 'branch-1.2'
Branch 1.2
See merge request megasearch/vecwise_engine!36
Former-commit-id: 2952b0d6a78a12f9872478a545709cbf601b42cf
|
2019-05-28 18:56:09 +08:00 |
|
groot
|
ab90dff7b4
|
implement sdk interface part2 change log
Former-commit-id: 41f1487f14d2c5e93700b0e521dfcf3410f3802d
|
2019-05-28 18:46:30 +08:00 |
|
yu yunfeng
|
4116f710f5
|
merge branch from Xu and add metrics
Former-commit-id: a5d3e97dbd87c6478ece637046a2d9545fbc973f
|
2019-05-28 18:46:07 +08:00 |
|
groot
|
5c79f1883c
|
implement sdk interface part2
Former-commit-id: e0f031025133d35456f685dfb2f4d3768ee99a56
|
2019-05-28 18:43:08 +08:00 |
|
groot
|
5fd733419b
|
update thrift to 0.12.0
Former-commit-id: e40fe340263e56126c7585823c273b17db08db7e
|
2019-05-28 18:23:35 +08:00 |
|
yu yunfeng
|
80db8aaf20
|
Fix compile error
Former-commit-id: 07f4dd06011ef519e29744dcd5b8ac9e407b2505
|
2019-05-28 17:50:20 +08:00 |
|
jinhai
|
97373af4f2
|
Merge branch 'code_refactor' into 'branch-1.2'
MS-20 Clean Code Part 1
See merge request megasearch/vecwise_engine!35
Former-commit-id: 41f8e60f0e70a4f87bc455d4db976bab58e06fce
|
2019-05-28 17:44:51 +08:00 |
|
yu yunfeng
|
4d8385790a
|
add feature
Former-commit-id: 3534c79716d1dbf9ba12d47c4de75fe19667aae4
|
2019-05-28 15:39:26 +08:00 |
|
yu yunfeng
|
815bf5550f
|
add metrics_unitest
Former-commit-id: 783161b2f8a70b24b605f2040f9381f4aa0fff07
|
2019-05-28 15:33:42 +08:00 |
|
yu yunfeng
|
a95b29aa27
|
add metrics without prometheus
Former-commit-id: e158ea586681abb5ec44bdc9025ec27e3aa21567
|
2019-05-28 15:06:17 +08:00 |
|
Xu Peng
|
13ef8219aa
|
refactor(db): update change log
Former-commit-id: 95c0f52c4f6b1b6723e72e71baed6bc640b7935f
|
2019-05-28 14:03:09 +08:00 |
|