diff --git a/cmake/input.inc b/cmake/input.inc index 3f90bca6cd6d868921739b9826efadef9c7fba6d..985cf1e4c19d98fd56af8daa183ad9b1d5ce6b82 100755 --- a/cmake/input.inc +++ b/cmake/input.inc @@ -92,8 +92,11 @@ IF (${MEMORY_SANITIZER} MATCHES "true") SET(TD_MEMORY_SANITIZER TRUE) ENDIF () -IF (${TSZ_DISABLED} MATCHES "true") - MESSAGE(STATUS "build with TSZ disabled") -ELSE() +IF (${TSZ_ENABLED} MATCHES "true") + # define add + MESSAGE(STATUS "build with TSZ enabled") ADD_DEFINITIONS(-DTD_TSZ) -ENDIF () + set(VAR_TSZ "TSZ" CACHE INTERNAL "global variant tsz" ) +ELSE() + set(VAR_TSZ "errTSZ" CACHE INTERNAL "global variant empty" ) +ENDIF() diff --git a/deps/CMakeLists.txt b/deps/CMakeLists.txt index 7c90088dce27cc7b8855f7c7c130c2d764063d14..516c752bd101f26f04c3986ed50edd55121c5a40 100644 --- a/deps/CMakeLists.txt +++ b/deps/CMakeLists.txt @@ -38,8 +38,6 @@ IF (TD_LINUX_64 AND JEMALLOC_ENABLED) ) ENDIF () -IF(TD_TSZ) - MESSAGE("TSZ module set disabled.") -ELSE() - ADD_SUBDIRECTORY(TSZ) -ENDIF() +IF (${TSZ_ENABLED} MATCHES "true") + ADD_SUBDIRECTORY(TSZ) +ENDIF() \ No newline at end of file diff --git a/deps/TSZ b/deps/TSZ index 18bc74ce5bf206dfe8aba451dde615012bbec649..0ca5b15a8eac40327dd737be52c926fa5675712c 160000 --- a/deps/TSZ +++ b/deps/TSZ @@ -1 +1 @@ -Subproject commit 18bc74ce5bf206dfe8aba451dde615012bbec649 +Subproject commit 0ca5b15a8eac40327dd737be52c926fa5675712c diff --git a/src/client/CMakeLists.txt b/src/client/CMakeLists.txt index eb12039ade500a8f481c4257cc94cf0d79be41bd..2f83557d63c288173f8b541caf32fe9fe2e73338 100644 --- a/src/client/CMakeLists.txt +++ b/src/client/CMakeLists.txt @@ -11,7 +11,7 @@ IF (TD_LINUX) # set the static lib name ADD_LIBRARY(taos_static STATIC ${SRC}) - TARGET_LINK_LIBRARIES(taos_static common query trpc tutil pthread m rt SZ) + TARGET_LINK_LIBRARIES(taos_static common query trpc tutil pthread m rt ${VAR_TSZ}) SET_TARGET_PROPERTIES(taos_static PROPERTIES OUTPUT_NAME "taos_static") SET_TARGET_PROPERTIES(taos_static PROPERTIES CLEAN_DIRECT_OUTPUT 1) diff --git a/src/kit/taospack/CMakeLists.txt b/src/kit/taospack/CMakeLists.txt index dc3d436a71ed5889b9326f5d9b835398dc97b960..58c36887329f0deb6839162dd966c96d09edbc0f 100644 --- a/src/kit/taospack/CMakeLists.txt +++ b/src/kit/taospack/CMakeLists.txt @@ -8,7 +8,7 @@ INCLUDE_DIRECTORIES(inc) IF (TD_LINUX) AUX_SOURCE_DIRECTORY(. SRC) ADD_EXECUTABLE(taospack ${SRC}) - TARGET_LINK_LIBRARIES(taospack os tutil tsdb SZ) + TARGET_LINK_LIBRARIES(taospack os tutil tsdb ${VAR_TSZ}) ELSEIF (TD_WINDOWS) AUX_SOURCE_DIRECTORY(. SRC) ADD_EXECUTABLE(taospack ${SRC}) diff --git a/src/util/CMakeLists.txt b/src/util/CMakeLists.txt index 32daf57173302b78857a93548643825155395c52..240559c3ce636cd2f1fb139f71e3632be2694384 100644 --- a/src/util/CMakeLists.txt +++ b/src/util/CMakeLists.txt @@ -7,7 +7,8 @@ INCLUDE_DIRECTORIES(${TD_COMMUNITY_DIR}/deps/rmonotonic/inc) INCLUDE_DIRECTORIES(${TD_COMMUNITY_DIR}/deps/SZ/sz/include) AUX_SOURCE_DIRECTORY(src SRC) ADD_LIBRARY(tutil ${SRC}) -TARGET_LINK_LIBRARIES(tutil pthread os lz4 z rmonotonic SZ ) + +TARGET_LINK_LIBRARIES(tutil pthread os lz4 z rmonotonic ${VAR_TSZ} ) diff --git a/src/util/src/tcompression.c b/src/util/src/tcompression.c index fd2a049eedfa79598001dcdd46938da14d2cb98e..83b0a114c7eb3cc4ce5d4d98b6579e3d1ecb750f 100644 --- a/src/util/src/tcompression.c +++ b/src/util/src/tcompression.c @@ -50,7 +50,7 @@ #include "os.h" #include "lz4.h" #ifdef TD_TSZ - #include "td_sz.h" + #include "../../../deps/TSZ/sz/include/td_sz.h" #endif #include "taosdef.h" #include "tscompression.h" @@ -86,7 +86,10 @@ int tsCompressInit(){ return 0; tdszInit(fPrecision, dPrecision, maxIntervals, intervals, Compressor); - uInfo("lossy compression is opened. columns = %s \n", lossyColumns); + if(lossyFloat) + uInfo("lossy compression float is opened. \n"); + if(lossyDouble) + uInfo("lossy compression double is opened. \n"); return 1; } // exit call