Merge pull request #10339 from taosdata/feature/TS-1220-V24

[TS-1220]<feature><tsdb>: add TSZ to default build

.gitmodules

@@ -10,6 +10,7 @@
 [submodule "deps/TSZ"]
 	path = deps/TSZ
 	url = https://github.com/taosdata/TSZ.git
+	branch = master
 [submodule "src/kit/taos-tools"]
 	path = src/kit/taos-tools
 	url = https://github.com/taosdata/taos-tools

cmake/input.inc

@@ -96,11 +96,12 @@ IF (${VERBOSE} MATCHES "true")
   SET(TD_BUILD_VERBOSE TRUE)
 ENDIF ()
 
-IF (${TSZ_ENABLED} MATCHES "true")
-  # define add
+# build TSZ by default
+IF ("${TSZ_ENABLED}" MATCHES "false")
+  set(VAR_TSZ "" CACHE INTERNAL "global variant empty" )
+ELSE()
+  # define add 
   MESSAGE(STATUS "build with TSZ enabled")
   ADD_DEFINITIONS(-DTD_TSZ)
   set(VAR_TSZ "TSZ" CACHE INTERNAL "global variant tsz" )
-ELSE()
-  set(VAR_TSZ "" CACHE INTERNAL "global variant empty" )
-ENDIF()
+ENDIF()
\ No newline at end of file

deps/CMakeLists.txt

@@ -45,6 +45,6 @@ IF (TD_LINUX_64 AND JEMALLOC_ENABLED)
   INCLUDE_DIRECTORIES(${CMAKE_BINARY_DIR}/build/include)
 ENDIF ()
 
-IF (${TSZ_ENABLED} MATCHES "true")
+IF (NOT "${TSZ_ENABLED}" MATCHES "false")
   ADD_SUBDIRECTORY(TSZ)
 ENDIF()

TSZ @ 11c1060d

+Subproject commit 11c1060d4f917dd799ae628b131db5d6a5ef6954

src/common/src/tglobal.c

@@ -1800,9 +1800,10 @@ static void doInitGlobalConfig(void) {
   cfg.ptrLength = 0;
   cfg.unitType = TAOS_CFG_UTYPE_NONE;
   taosInitConfigOption(cfg);
-  assert(tsGlobalConfigNum < TSDB_CFG_MAX_NUM);
+  assert(tsGlobalConfigNum == TSDB_CFG_MAX_NUM);
 #else
-  assert(tsGlobalConfigNum < TSDB_CFG_MAX_NUM);
+  // if TD_TSZ macro define, have 5 count configs, so must add 5
+  assert(tsGlobalConfigNum + 5 == TSDB_CFG_MAX_NUM);
 #endif
 }
 

src/kit/taospack/taospack.c

@@ -704,7 +704,7 @@ void leakFloat() {
 
 
 void leakTest(){
-  for(int i=0; i< 90000000000000; i++){
+  for(int i=0; i< 90000000; i++){
     if(i%10000==0)
         printf(" ---------- %d ---------------- \n", i);
     leakFloat();

src/util/inc/tconfig.h

@@ -20,7 +20,7 @@
 extern "C" {
 #endif
 
-#define TSDB_CFG_MAX_NUM    131
+#define TSDB_CFG_MAX_NUM    132
 #define TSDB_CFG_PRINT_LEN  23
 #define TSDB_CFG_OPTION_LEN 24
 #define TSDB_CFG_VALUE_LEN  41