528 Commits

Author SHA1 Message Date
zhiru
8f7e8c5570 MS-54 - cmake: Change Thirft thrid party URL to github.com
Former-commit-id: 7ce6dad58035d01db9f7060be2b1142014434383
2019-06-02 11:46:31 +08:00
yu yunfeng
67a5acf669 fix unitest
Former-commit-id: 1da98cfbf78110fa3732899e45ff3722eaf921ed
2019-05-30 15:54:22 +08:00
yu yunfeng
2b472a3340 fix CHANGELOG CONFLICT
Former-commit-id: 22222b13fe56975a13b45066b1b7b721d124729c
2019-05-30 15:13:29 +08:00
yu yunfeng
dcc6752495 add task in changelog
Former-commit-id: a88c6ecd7b97dccadb492c5df94729da2e52f136
2019-05-30 15:01:07 +08:00
yu yunfeng
f8c46af560 fix metrics test and add prometheus conf
Former-commit-id: 0c7ff6f49880db0ce4dd22ea1375886fb0e9b03d
2019-05-30 14:50:16 +08:00
jinhai
3896fca2c7 Merge branch 'branch-1.2' into 'branch-1.2'
MS-33 - cmake: add -j4 to make third party packages build faster

See merge request megasearch/vecwise_engine!46

Former-commit-id: 37ce72de7e03ed04b9b2b9b1b12d8fcb495d5e6f
2019-05-30 11:19:14 +08:00
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
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
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
groot
39df2d4d1e fix third-party link error
Former-commit-id: 54782a2d0812e836544ca8667c1ee42a4e934830
2019-05-29 17:30:27 +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
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
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
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
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
yu yunfeng
80db8aaf20 Fix compile error
Former-commit-id: 07f4dd06011ef519e29744dcd5b8ac9e407b2505
2019-05-28 17:50:20 +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
Xu Peng
120a52c184 refactor(db): replace typedef with using
Former-commit-id: 62caeac6fb8a05cabe0622abe73d7b5b548f8472
2019-05-28 14:01:54 +08:00
Xu Peng
9b5791b434 refactor(db): small change
Former-commit-id: 057c7a7b4b9189895d7aac3e253387fe91daee0e
2019-05-28 13:59:16 +08:00
Xu Peng
c5501202ad refactor(db): whole db api refactor
Former-commit-id: 3519e8a464bcd66b6da8ef2c579c08eaf13d17bd
2019-05-28 13:49:59 +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
yu yunfeng
1563f81ac2 add metrics
Former-commit-id: 3e811d555cf69eb2c8f515ada44c8df43e460de0
2019-05-28 13:34:47 +08:00
Xu Peng
130b710169 refactor(db): MS-20
Former-commit-id: f34dd2746073c837fa877697e32f1ce3607e35c2
2019-05-28 11:04:37 +08:00
Xu Peng
c8bcf53d81 refactor(db): refactor for db impl
Former-commit-id: f7488d5189ed1c34d9b3e8e3da4eaa71766f9c11
2019-05-28 11:04:37 +08:00
Xu Peng
541692c227 refactor(db): include file seq and cpp->inl
Former-commit-id: 970bb6ef009b1806a4f60f6d1f5d62e0aeb1ca5e
2019-05-28 11:04:37 +08:00
Xu Peng
73ffe9f796 refactor(db): include files seq
Former-commit-id: 1236730a49eb3ab3611e001aee95a6a28173f4ca
2019-05-28 11:04:37 +08:00