xxq250
/
homework-jianmu
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

Set global var VAR_TSZ fixed build error

This commit is contained in:
tickduan 2021-07-20 15:47:34 +08:00
parent e46f672062
commit c8ecafed59
7 changed files with 20 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
cmake/input.inc
View File

@ -92,8 +92,11 @@ IF (${MEMORY_SANITIZER} MATCHES "true")
SET(TD_MEMORY_SANITIZER TRUE) SET(TD_MEMORY_SANITIZER TRUE)
ENDIF () ENDIF ()
IF (${TSZ_DISABLED} MATCHES "true") IF (${TSZ_ENABLED} MATCHES "true")
MESSAGE(STATUS "build with TSZ disabled") # define add
ELSE() MESSAGE(STATUS "build with TSZ enabled")
ADD_DEFINITIONS(-DTD_TSZ) 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()

8
deps/CMakeLists.txt vendored
View File

@ -38,8 +38,6 @@ IF (TD_LINUX_64 AND JEMALLOC_ENABLED)
) )
ENDIF () ENDIF ()
IF(TD_TSZ) IF (${TSZ_ENABLED} MATCHES "true")
MESSAGE("TSZ module set disabled.") ADD_SUBDIRECTORY(TSZ)
ELSE() ENDIF()
ADD_SUBDIRECTORY(TSZ)
ENDIF()

2
deps/TSZ vendored

@ -1 +1 @@
Subproject commit 18bc74ce5bf206dfe8aba451dde615012bbec649 Subproject commit 0ca5b15a8eac40327dd737be52c926fa5675712c

2
src/client/CMakeLists.txt
View File

@ -11,7 +11,7 @@ IF (TD_LINUX)
# set the static lib name # set the static lib name
ADD_LIBRARY(taos_static STATIC ${SRC}) 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 OUTPUT_NAME "taos_static")
SET_TARGET_PROPERTIES(taos_static PROPERTIES CLEAN_DIRECT_OUTPUT 1) SET_TARGET_PROPERTIES(taos_static PROPERTIES CLEAN_DIRECT_OUTPUT 1)

2
src/kit/taospack/CMakeLists.txt
View File

@ -8,7 +8,7 @@ INCLUDE_DIRECTORIES(inc)
IF (TD_LINUX) IF (TD_LINUX)
AUX_SOURCE_DIRECTORY(. SRC) AUX_SOURCE_DIRECTORY(. SRC)
ADD_EXECUTABLE(taospack ${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) ELSEIF (TD_WINDOWS)
AUX_SOURCE_DIRECTORY(. SRC) AUX_SOURCE_DIRECTORY(. SRC)
ADD_EXECUTABLE(taospack ${SRC}) ADD_EXECUTABLE(taospack ${SRC})

3
src/util/CMakeLists.txt
View File

@ -7,7 +7,8 @@ INCLUDE_DIRECTORIES(${TD_COMMUNITY_DIR}/deps/rmonotonic/inc)
INCLUDE_DIRECTORIES(${TD_COMMUNITY_DIR}/deps/SZ/sz/include) INCLUDE_DIRECTORIES(${TD_COMMUNITY_DIR}/deps/SZ/sz/include)
AUX_SOURCE_DIRECTORY(src SRC) AUX_SOURCE_DIRECTORY(src SRC)
ADD_LIBRARY(tutil ${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} )

7
src/util/src/tcompression.c
View File

@ -50,7 +50,7 @@
#include "os.h" #include "os.h"
#include "lz4.h" #include "lz4.h"
#ifdef TD_TSZ #ifdef TD_TSZ
#include "td_sz.h" #include "../../../deps/TSZ/sz/include/td_sz.h"
#endif #endif
#include "taosdef.h" #include "taosdef.h"
#include "tscompression.h" #include "tscompression.h"
@ -86,7 +86,10 @@ int tsCompressInit(){
return 0; return 0;
tdszInit(fPrecision, dPrecision, maxIntervals, intervals, Compressor); 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; return 1;
} }
// exit call // exit call