Commit Graph

692 Commits (d601408b08881d1b1fb047223e8eac7ec5daa911)

Author SHA1 Message Date
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
zhiru 31a00449a4 MS-26 cmake. Add thirdparty packages
Former-commit-id: a68611c035820a429ae5ef1ae104a9826838dcca
2019-05-29 16:14:15 +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
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
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
Xu Peng ce329b4304 refactor(db): Env.cpp Env.h
Former-commit-id: 5d774124457d4136dc8c0e4469ac6950c424de09
2019-05-28 11:04:37 +08:00
Xu Peng fbeddc2ad5 refactor(db): refactor for execution engine
Former-commit-id: 5bf686bae2669ecfe6c4ba722a001c6303bb2f43
2019-05-28 11:04:37 +08:00
Xu Peng 2eff64def1 refactor(db): refactor for DBMetaImpl
Former-commit-id: 9ced33145335090265c53344b4ff46a977eec356
2019-05-28 11:04:37 +08:00
Xu Peng ca33fbbe14 refactor(db): DropAll -Count CleanUp CleanUpFilesWithTTL
Former-commit-id: b718bb89945651de19a1263eaf64eab22d11eb6c
2019-05-28 11:04:37 +08:00
Xu Peng 874eeb8f7a refactor(db): FilesToIndex
Former-commit-id: fe5bd8ca372d0a4d5bf257f3f10853179d2356ce
2019-05-28 11:04:37 +08:00
Xu Peng 7fe5346f14 refactor(db): Archive
Former-commit-id: 21f153c1a57ad4bb706f6b177a10d45faf88ed99
2019-05-28 11:04:37 +08:00
Xu Peng de8811ae9a refactor(db): Size
Former-commit-id: 9dc93505e1378a1e8b14750158c2f8b9b2f840ca
2019-05-28 11:04:37 +08:00
Xu Peng 2789234931 refactor(db): FilesToMerge
Former-commit-id: 9101dcd75943bc241094af92156805090bf8e408
2019-05-28 11:04:37 +08:00
Xu Peng 09fdd0f849 refactor(db): FilesToSearch
Former-commit-id: dcb7f972ee13a0916129dfec5b05dad66025dfbf
2019-05-28 11:04:37 +08:00
Xu Peng edf33115e4 refactor(db): UpdateTableFiles
Former-commit-id: 749cfe1d229a7f2edadd3cd913b96e0087be9cc5
2019-05-28 11:04:37 +08:00
Xu Peng ec4e83db3f refactor(db): UpdateTableFile
Former-commit-id: e5b29fa1396d5a06c26a4917e15fed0082bbc7ae
2019-05-28 11:04:37 +08:00
Xu Peng 3852b830b0 refactor(db): delete get_group_files
Former-commit-id: 0503a8a92ab9687912c516390af1c8fe0e4cd96a
2019-05-28 11:04:37 +08:00
Xu Peng ba8929e9a4 refactor(db): GetTableFile
Former-commit-id: 9b5f8d3a6c3202acc5b16f9b75f4ebe9cb2c6c50
2019-05-28 11:04:37 +08:00
Xu Peng 59fa814af4 refactor(db): delete has_group_file
Former-commit-id: 821b2784c727d30375b7ce5c2bf3e9e9aef16fd8
2019-05-28 11:04:37 +08:00
Xu Peng fbe1278a3a refactor(db): DropPartitionsByDates
Former-commit-id: 2534fa34f690ba60788e3619b6a87a9a7ed8650e
2019-05-28 11:04:37 +08:00
Xu Peng 01e4e605e2 refactor(db): CreateTableFile
Former-commit-id: c29b8ccc97cc327ec9c278f2ea5456369365c4f3
2019-05-28 11:04:37 +08:00
Xu Peng 9d4591612d refactor(db): delete local meta impl and refactor HasTable
Former-commit-id: 4849b994d40cf433797892eb37ceeac46fc65d3d
2019-05-28 11:04:37 +08:00
Xu Peng 624e34f10d refactor(db): refactor DescribeTable
Former-commit-id: 021d731f3be6f338423caabef59bdd4c46ed02d8
2019-05-28 11:04:37 +08:00
Xu Peng 3d330e0aa4 refactor(db): change group_info to table_schema and add_group to CreateTable
Former-commit-id: e8d48ec8e54429bf5d1080997ca329b42ddcab82
2019-05-28 11:04:37 +08:00