diff --git a/include/util/tcompression.h b/include/util/tcompression.h index 892042c580..1db7fb9dd0 100644 --- a/include/util/tcompression.h +++ b/include/util/tcompression.h @@ -54,7 +54,8 @@ extern "C" { #ifdef TD_TSZ extern bool lossyFloat; extern bool lossyDouble; -int32_t tsCompressInit(); +int32_t tsCompressInit(char* lossyColumns, double fPrecision, double dPrecision, unsigned int32_t maxIntervals, + unsigned int32_t intervals, int32_t intervals, const char* compressor); void tsCompressExit(); int32_t tsCompressFloatLossyImp(const char *const input, const int32_t nelements, char *const output); diff --git a/source/dnode/mgmt/node_mgmt/src/dmMgmt.c b/source/dnode/mgmt/node_mgmt/src/dmMgmt.c index c620502056..dedd588c53 100644 --- a/source/dnode/mgmt/node_mgmt/src/dmMgmt.c +++ b/source/dnode/mgmt/node_mgmt/src/dmMgmt.c @@ -19,6 +19,10 @@ #include "index.h" #include "qworker.h" #include "tstream.h" +#ifdef TD_TSZ +#include "tglobal.h" +#include "tcompression.h" +#endif static bool dmRequireNode(SDnode *pDnode, SMgmtWrapper *pWrapper) { SMgmtInputOpt input = dmBuildMgmtInputOpt(pWrapper); @@ -113,7 +117,7 @@ int32_t dmInitDnode(SDnode *pDnode) { #ifdef TD_TSZ // compress module init - tsCompressInit(); + tsCompressInit(tsLossyColumns, tsFPrecision, tsDPrecision, tsMaxRange, tsCurRange, (int)tsIfAdtFse, tsCompressor); #endif pDnode->wrappers[DNODE].func = dmGetMgmtFunc(); diff --git a/source/util/CMakeLists.txt b/source/util/CMakeLists.txt index e6c2a9fd37..3008a347ad 100644 --- a/source/util/CMakeLists.txt +++ b/source/util/CMakeLists.txt @@ -25,7 +25,6 @@ target_link_libraries( PUBLIC os PUBLIC lz4_static PUBLIC api cjson geos_c TSZ - PUBLIC common ) if(${BUILD_TEST}) diff --git a/source/util/src/tcompression.c b/source/util/src/tcompression.c index 53d6bddb0e..ff8232c6ba 100644 --- a/source/util/src/tcompression.c +++ b/source/util/src/tcompression.c @@ -52,7 +52,6 @@ #include "lz4.h" #include "tRealloc.h" #include "tlog.h" -#include "tglobal.h" #ifdef TD_TSZ #include "td_sz.h" @@ -71,20 +70,21 @@ bool lossyFloat = false; bool lossyDouble = false; // init call -int32_t tsCompressInit() { +int32_t tsCompressInit(char* lossyColumns, double fPrecision, double dPrecision, unsigned int32_t maxIntervals, + unsigned int32_t intervals, int32_t intervals, const char* compressor) // config - if (tsLossyColumns[0] == 0) { + if (lossyColumns[0] == 0) { lossyFloat = false; lossyDouble = false; return 0; } - lossyFloat = strstr(tsLossyColumns, "float") != NULL; - lossyDouble = strstr(tsLossyColumns, "double") != NULL; + lossyFloat = strstr(lossyColumns, "float") != NULL; + lossyDouble = strstr(lossyColumns, "double") != NULL; if (lossyFloat == false && lossyDouble == false) return 0; - tdszInit(tsFPrecision, tsDPrecision, tsMaxRange, tsCurRange, (int)tsIfAdtFse, tsCompressor); + tdszInit(fPrecision, dPrecision, maxIntervals, intervals, intervals, compressor); if (lossyFloat) uTrace("lossy compression float is opened. "); if (lossyDouble) uTrace("lossy compression double is opened. "); return 1;