From 5fc96f8ccf93fd468989ca52f11d5a088335d3ae Mon Sep 17 00:00:00 2001 From: Hongze Cheng Date: Sat, 9 Oct 2021 10:17:40 +0800 Subject: [PATCH] refact --- cmake/leveldb_CMakeLists.txt.in | 13 +++++++++++++ cmake/rocksdb_CMakeLists.txt.in | 11 +++++++++++ include/server/vnode/tsdb/tsdb.h | 10 +++++----- source/server/vnode/meta/src/meta.c | 20 +------------------- source/server/vnode/tsdb/src/tsdb.c | 2 +- 5 files changed, 31 insertions(+), 25 deletions(-) create mode 100644 cmake/leveldb_CMakeLists.txt.in create mode 100644 cmake/rocksdb_CMakeLists.txt.in diff --git a/cmake/leveldb_CMakeLists.txt.in b/cmake/leveldb_CMakeLists.txt.in new file mode 100644 index 0000000000..7392f3d245 --- /dev/null +++ b/cmake/leveldb_CMakeLists.txt.in @@ -0,0 +1,13 @@ + +# leveldb +ExternalProject_Add(leveldb + GIT_REPOSITORY https://github.com/taosdata-contrib/leveldb.git + GIT_TAG master + SOURCE_DIR "${CMAKE_SOURCE_DIR}/deps/leveldb" + BINARY_DIR "" + #BUILD_IN_SOURCE TRUE + CONFIGURE_COMMAND "" + BUILD_COMMAND "" + INSTALL_COMMAND "" + TEST_COMMAND "" +) \ No newline at end of file diff --git a/cmake/rocksdb_CMakeLists.txt.in b/cmake/rocksdb_CMakeLists.txt.in new file mode 100644 index 0000000000..bacc48ecac --- /dev/null +++ b/cmake/rocksdb_CMakeLists.txt.in @@ -0,0 +1,11 @@ + +# rocksdb +ExternalProject_Add(rocksdb + GIT_REPOSITORY https://github.com/taosdata-contrib/rocksdb.git + GIT_TAG v6.23.3 + SOURCE_DIR "${CMAKE_SOURCE_DIR}/deps/rocksdb" + CONFIGURE_COMMAND "" + BUILD_COMMAND "" + INSTALL_COMMAND "" + TEST_COMMAND "" + ) \ No newline at end of file diff --git a/include/server/vnode/tsdb/tsdb.h b/include/server/vnode/tsdb/tsdb.h index a25cb47985..09cebc7bb6 100644 --- a/include/server/vnode/tsdb/tsdb.h +++ b/include/server/vnode/tsdb/tsdb.h @@ -57,17 +57,17 @@ void tsdbOptionsSetSMA(STsdbOptions *, STsdbSMAOptions *); // STsdbSMAOptions STsdbSMAOptions *tsdbSMAOptionsCreate(); void tsdbSMAOptionsDestroy(STsdbSMAOptions *); -void tsdbSMAOptionsSetFuncs(STsdbSMAOptions *, SArray * /*Array of function to perform on each block*/); -void tsdbSMAOptionsSetIntervals(STsdbSMAOptions *, SArray *); -void tsdbSMAOptionsSetColTypes(STsdbSMAOptions *, SArray *); +// void tsdbSMAOptionsSetFuncs(STsdbSMAOptions *, SArray * /*Array of function to perform on each block*/); +// void tsdbSMAOptionsSetIntervals(STsdbSMAOptions *, SArray *); +// void tsdbSMAOptionsSetColTypes(STsdbSMAOptions *, SArray *); // STsdbQueryHandle STsdbQueryHandle *tsdbQueryHandleCreate(STsdb *, STsdbReadOptions *); void tsdbQueryHandleDestroy(STsdbQueryHandle *); void tsdbResetQueryHandle(STsdbQueryHandle *, STsdbReadOptions *); bool tsdbNextDataBlock(STsdbQueryHandle *); -void tsdbGetDataBlockInfo(STsdbQueryHandle *, SDataBlockInfo *); -void tsdbGetDataBlockStatisInfo(STsdbQueryHandle *, SDataStatis **); +// void tsdbGetDataBlockInfo(STsdbQueryHandle *, SDataBlockInfo *); +// void tsdbGetDataBlockStatisInfo(STsdbQueryHandle *, SDataStatis **); // STsdbReadOptions STsdbReadOptions *tsdbReadOptionsCreate(); diff --git a/source/server/vnode/meta/src/meta.c b/source/server/vnode/meta/src/meta.c index 7d8ec11494..d05fa1754f 100644 --- a/source/server/vnode/meta/src/meta.c +++ b/source/server/vnode/meta/src/meta.c @@ -15,22 +15,4 @@ #include "meta.h" -int metaCreateTable(SMeta *pMeta, SCreateTableReq *pReq) { - // TODO - return 0; -} - -int metaDropTable(SMeta *pMeta, SDropTableReq *pReq) { - // TODO - return 0; -} - -int metaAlterTable(SMeta *pMeta, SAlterTableReq *pReq) { - // TODO - return 0; -} - -int metaCommit(SMeta *pMeta) { - // TODO - return 0; -} \ No newline at end of file +int metaCommit(SMeta *meta) { return 0; } \ No newline at end of file diff --git a/source/server/vnode/tsdb/src/tsdb.c b/source/server/vnode/tsdb/src/tsdb.c index b79d6a850e..56637ec74e 100644 --- a/source/server/vnode/tsdb/src/tsdb.c +++ b/source/server/vnode/tsdb/src/tsdb.c @@ -15,5 +15,5 @@ #include "tsdb.h" -int tsdbInsert(STsdb *pTsdb, SSubmitReq *pMsg) { return 0; } +int tsdbInsert(STsdb *tsdb, SSubmitReq *pReq, SSubmitRsp *pRsp) { return 0; } int tsdbCommit(STsdb *pTsdb) { return 0; } \ No newline at end of file