提交 c8ecafed 编写于 作者: T tickduan

Set global var VAR_TSZ fixed build error

上级 e46f6720
......@@ -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()
......@@ -38,8 +38,6 @@ IF (TD_LINUX_64 AND JEMALLOC_ENABLED)
)
ENDIF ()
IF(TD_TSZ)
MESSAGE("TSZ module set disabled.")
ELSE()
IF (${TSZ_ENABLED} MATCHES "true")
ADD_SUBDIRECTORY(TSZ)
ENDIF()
\ No newline at end of file
Subproject commit 18bc74ce5bf206dfe8aba451dde615012bbec649
Subproject commit 0ca5b15a8eac40327dd737be52c926fa5675712c
......@@ -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)
......
......@@ -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})
......
......@@ -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} )
......
......@@ -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
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册