restore no change file from develop

cmake/define.inc

@@ -61,7 +61,7 @@ IF (TD_LINUX_64)
   ADD_DEFINITIONS(-D_M_X64)
   ADD_DEFINITIONS(-D_TD_LINUX_64)
   MESSAGE(STATUS "linux64 is defined")
-  SET(COMMON_FLAGS "-std=gnu99 -Wall -Werror -fPIC -gdwarf-2 -msse4.2 -D_FILE_OFFSET_BITS=64 -D_LARGE_FILE")
+  SET(COMMON_FLAGS "-Wall -Werror -fPIC -gdwarf-2 -msse4.2 -D_FILE_OFFSET_BITS=64 -D_LARGE_FILE")
   ADD_DEFINITIONS(-DUSE_LIBICONV)
 
   IF (JEMALLOC_ENABLED)
@@ -74,7 +74,7 @@ IF (TD_LINUX_32)
   ADD_DEFINITIONS(-D_TD_LINUX_32)
   ADD_DEFINITIONS(-DUSE_LIBICONV)
   MESSAGE(STATUS "linux32 is defined")
-  SET(COMMON_FLAGS "-std=gnu99 -Wall -Werror -fPIC -fsigned-char -munaligned-access -fpack-struct=8 -D_FILE_OFFSET_BITS=64 -D_LARGE_FILE")
+  SET(COMMON_FLAGS "-Wall -Werror -fPIC -fsigned-char -munaligned-access -fpack-struct=8 -D_FILE_OFFSET_BITS=64 -D_LARGE_FILE")
 ENDIF ()
 
 IF (TD_ARM_64)
@@ -82,7 +82,7 @@ IF (TD_ARM_64)
   ADD_DEFINITIONS(-D_TD_ARM_)
   ADD_DEFINITIONS(-DUSE_LIBICONV)
   MESSAGE(STATUS "arm64 is defined")
-  SET(COMMON_FLAGS "-std=gnu99 -Wall -Werror -fPIC -fsigned-char -fpack-struct=8 -D_FILE_OFFSET_BITS=64 -D_LARGE_FILE")
+  SET(COMMON_FLAGS "-Wall -Werror -fPIC -fsigned-char -fpack-struct=8 -D_FILE_OFFSET_BITS=64 -D_LARGE_FILE")
 ENDIF ()
 
 IF (TD_ARM_32)
@@ -90,7 +90,7 @@ IF (TD_ARM_32)
   ADD_DEFINITIONS(-D_TD_ARM_)
   ADD_DEFINITIONS(-DUSE_LIBICONV)
   MESSAGE(STATUS "arm32 is defined")
-  SET(COMMON_FLAGS "-std=gnu99 -Wall -Werror -fPIC -fsigned-char -fpack-struct=8 -D_FILE_OFFSET_BITS=64 -D_LARGE_FILE -Wno-pointer-to-int-cast -Wno-int-to-pointer-cast -Wno-incompatible-pointer-types ")
+  SET(COMMON_FLAGS "-Wall -Werror -fPIC -fsigned-char -fpack-struct=8 -D_FILE_OFFSET_BITS=64 -D_LARGE_FILE -Wno-pointer-to-int-cast -Wno-int-to-pointer-cast -Wno-incompatible-pointer-types ")
 ENDIF ()
 
 IF (TD_MIPS_64)
@@ -98,7 +98,7 @@ IF (TD_MIPS_64)
   ADD_DEFINITIONS(-D_TD_MIPS_64)
   ADD_DEFINITIONS(-DUSE_LIBICONV)
   MESSAGE(STATUS "mips64 is defined")
-  SET(COMMON_FLAGS "-std=gnu99 -Wall -Werror -fPIC -fsigned-char -fpack-struct=8 -D_FILE_OFFSET_BITS=64 -D_LARGE_FILE")
+  SET(COMMON_FLAGS "-Wall -Werror -fPIC -fsigned-char -fpack-struct=8 -D_FILE_OFFSET_BITS=64 -D_LARGE_FILE")
 ENDIF ()
 
 IF (TD_MIPS_32)
@@ -106,7 +106,7 @@ IF (TD_MIPS_32)
   ADD_DEFINITIONS(-D_TD_MIPS_32)
   ADD_DEFINITIONS(-DUSE_LIBICONV)
   MESSAGE(STATUS "mips32 is defined")
-  SET(COMMON_FLAGS "-std=gnu99 -Wall -Werror -fPIC -D_FILE_OFFSET_BITS=64 -D_LARGE_FILE")
+  SET(COMMON_FLAGS "-Wall -Werror -fPIC -D_FILE_OFFSET_BITS=64 -D_LARGE_FILE")
 ENDIF ()
 
 IF (TD_APLHINE)
@@ -156,7 +156,6 @@ IF (TD_DARWIN_64)
   ELSE ()
     SET(COMMON_FLAGS "-Wall -Werror -Wno-missing-braces -fPIC -msse4.2 -D_FILE_OFFSET_BITS=64 -D_LARGE_FILE")
   ENDIF ()
-
   IF (TD_MEMORY_SANITIZER)
     SET(DEBUG_FLAGS "-fsanitize=address -fsanitize=undefined -fno-sanitize-recover=all -fsanitize=float-divide-by-zero -fsanitize=float-cast-overflow -fno-sanitize=null -fno-sanitize=alignment -O0 -g3 -DDEBUG")
   ELSE ()

cmake/env.inc

@@ -35,13 +35,13 @@ ENDIF ()
 
 # Set compiler options
 SET(COMMON_C_FLAGS "${COMMON_FLAGS} -std=gnu99")
-SET(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} ${COMMON_FLAGS} ${DEBUG_FLAGS}")
-SET(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} ${COMMON_FLAGS} ${RELEASE_FLAGS}")
+SET(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} ${COMMON_C_FLAGS} ${DEBUG_FLAGS}")
+SET(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} ${COMMON_C_FLAGS} ${RELEASE_FLAGS}")
 
 # Set c++ compiler options
-# SET(COMMON_CXX_FLAGS "${COMMON_FLAGS} -std=c++11")
-# SET(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} ${COMMON_CXX_FLAGS} ${DEBUG_FLAGS}")
-# SET(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} ${COMMON_CXX_FLAGS} ${RELEASE_FLAGS}")
+SET(COMMON_CXX_FLAGS "${COMMON_FLAGS} -std=c++11 -Wno-unused-function")
+SET(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} ${COMMON_CXX_FLAGS} ${DEBUG_FLAGS}")
+SET(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} ${COMMON_CXX_FLAGS} ${RELEASE_FLAGS}")
 
 IF (${CMAKE_BUILD_TYPE} MATCHES "Debug")
   SET(CMAKE_BUILD_TYPE "Debug")

cmake/version.inc

@@ -4,7 +4,7 @@ PROJECT(TDengine)
 IF (DEFINED VERNUMBER)
   SET(TD_VER_NUMBER ${VERNUMBER})
 ELSE ()
-  SET(TD_VER_NUMBER "2.1.1.0")
+  SET(TD_VER_NUMBER "2.1.3.0")
 ENDIF ()
 
 IF (DEFINED VERCOMPATIBLE)

deps/SZ/.dockerignore

-build.*

deps/SZ/.gitignore

-build
-compile_commands.json
-tags
-CMakeCache.txt
-cmake-build-debug/
-CMakeFiles/

deps/SZ/.travis.yml

-sudo: false
-
-language: c
-
-before_install:
-- cd test/travis-ci && ./getData.sh && cd -
-
-matrix:
-  include:
-    - dist: xenial
-      os: linux
-      addons:
-        apt:
-          sources:
-            - ubuntu-toolchain-r-test     # For gcc 4.9, 5 and 7
-          packages:
-            - gcc-7
-            - gfortran-7
-            - zstd
-            - libzstd1-dev
-            - exuberant-ctags
-            - libcunit1-dev 
-            - libnetcdf-dev 
-    - osx_image: xcode11
-      os: osx
-      env: PATH=/usr/local/bin:$PATH
-install:
-    - mkdir build
-    - cd build
-    - |
-      if [[ "${TRAVIS_OS_NAME}" != "linux" ]]; then
-        brew install ctags
-        brew install cunit
-        brew upgrade pkg-config
-      fi
-    - cmake -DCMAKE_INSTALL_PREFIX=$HOME -DBUILD_TESTS=ON -DBUILD_INTEGRATION_TESTS=ON ..
-    - make 
-    - make install
-    - make test
-
-script:
-- cd ..
-- ./configure && make
-- cd example && ./test.sh && cd -
-- cd test/travis-ci && ./test.sh && cd -

deps/SZ/zstd/Makefile.am

-AUTOMAKE_OPTIONS=foreign
-include_HEADERS=./compress/zstdmt_compress.h \
-		./compress/zstd_opt.h \
-		./compress/zstd_ldm.h \
-		./compress/zstd_compress_internal.h \
-		./compress/hist.h \
-		./compress/zstd_fast.h \
-		./compress/zstd_double_fast.h \
-		./compress/zstd_lazy.h \
-		./common/fse.h \
-		./common/bitstream.h \
-		./common/mem.h \
-		./common/zstd_errors.h \
-		./common/compiler.h \
-		./common/debug.h \
-		./common/huf.h \
-		./common/zstd_internal.h \
-		./common/xxhash.h \
-		./common/cpu.h \
-		./common/pool.h \
-		./common/threading.h \
-		./common/error_private.h \
-		./deprecated/zbuff.h \
-		./dictBuilder/zdict.h \
-		./dictBuilder/divsufsort.h \
-		./legacy/zstd_v07.h \
-		./legacy/zstd_v02.h \
-		./legacy/zstd_v04.h \
-		./legacy/zstd_legacy.h \
-		./legacy/zstd_v06.h \
-		./legacy/zstd_v05.h \
-		./legacy/zstd_v01.h \
-		./legacy/zstd_v03.h \
-		./zstd.h
-lib_LTLIBRARIES=libzstd.la
-libzstd_la_CFLAGS=-I./ -I./compress -I./common -I./deprecated -I./dictBuilder -I./legacy
-libzstd_la_SOURCES=./decompress/zstd_decompress.c \
-		./decompress/huf_decompress.c \
-		./compress/zstd_lazy.c \
-		./compress/zstdmt_compress.c \
-		./compress/zstd_double_fast.c \
-		./compress/zstd_fast.c \
-		./compress/hist.c \
-		./compress/fse_compress.c \
-		./compress/zstd_opt.c \
-		./compress/zstd_compress.c \
-		./compress/huf_compress.c \
-		./compress/zstd_ldm.c \
-		./common/xxhash.c \
-		./common/fse_decompress.c \
-		./common/pool.c \
-		./common/zstd_common.c \
-		./common/error_private.c \
-		./common/debug.c \
-		./common/threading.c \
-		./common/entropy_common.c \
-		./deprecated/zbuff_compress.c \
-		./deprecated/zbuff_decompress.c \
-		./deprecated/zbuff_common.c \
-		./dictBuilder/zdict.c \
-		./dictBuilder/divsufsort.c \
-		./dictBuilder/cover.c \
-		./legacy/zstd_v03.c \
-		./legacy/zstd_v07.c \
-		./legacy/zstd_v06.c \
-		./legacy/zstd_v01.c \
-		./legacy/zstd_v02.c \
-		./legacy/zstd_v04.c \
-		./legacy/zstd_v05.c

src/client/CMakeLists.txt

@@ -5,7 +5,6 @@ INCLUDE_DIRECTORIES(inc)
 INCLUDE_DIRECTORIES(jni)
 INCLUDE_DIRECTORIES(${TD_COMMUNITY_DIR}/src/query/inc)
 AUX_SOURCE_DIRECTORY(src SRC)
-link_directories(/share/lib)
 
 IF (TD_LINUX)
   INCLUDE_DIRECTORIES(${TD_COMMUNITY_DIR}/deps/jni/linux)

src/common/src/tglobal.c

@@ -180,15 +180,15 @@ int8_t  tsEnableStream = 1;
 int8_t tsCompactMnodeWal = 0;
 int8_t tsPrintAuth = 0;
 int8_t tscEmbedded = 0;
-char   configDir[TSDB_FILENAME_LEN] = {0};
-char   tsVnodeDir[TSDB_FILENAME_LEN] = {0};
-char   tsDnodeDir[TSDB_FILENAME_LEN] = {0};
-char   tsMnodeDir[TSDB_FILENAME_LEN] = {0};
-char   tsMnodeTmpDir[TSDB_FILENAME_LEN] = {0};
-char   tsMnodeBakDir[TSDB_FILENAME_LEN] = {0};
-char   tsDataDir[TSDB_FILENAME_LEN] = {0};
-char   tsScriptDir[TSDB_FILENAME_LEN] = {0};
-char   tsTempDir[TSDB_FILENAME_LEN] = "/tmp/";
+char   configDir[PATH_MAX] = {0};
+char   tsVnodeDir[PATH_MAX] = {0};
+char   tsDnodeDir[PATH_MAX] = {0};
+char   tsMnodeDir[PATH_MAX] = {0};
+char   tsMnodeTmpDir[PATH_MAX] = {0};
+char   tsMnodeBakDir[PATH_MAX] = {0};
+char   tsDataDir[PATH_MAX] = {0};
+char   tsScriptDir[PATH_MAX] = {0};
+char   tsTempDir[PATH_MAX] = "/tmp/";
 
 int32_t  tsDiskCfgNum = 0;
 

src/common/src/ttypes.c

@@ -368,7 +368,7 @@ static void getStatics_nchr(const void *pData, int32_t numOfRow, int64_t *min, i
 }
 
 tDataTypeDescriptor tDataTypes[15] = {
-  {TSDB_DATA_TYPE_NULL,      6,  1,            "NOTYPE",             NULL,                NULL,                  NULL},
+  {TSDB_DATA_TYPE_NULL,      6,1,        "NOTYPE",   NULL,     NULL,      NULL},
   {TSDB_DATA_TYPE_BOOL,      4,  CHAR_BYTES,   "BOOL",               tsCompressBool,      tsDecompressBool,      getStatics_bool},
   {TSDB_DATA_TYPE_TINYINT,   7,  CHAR_BYTES,   "TINYINT",            tsCompressTinyint,   tsDecompressTinyint,   getStatics_i8},
   {TSDB_DATA_TYPE_SMALLINT,  8,  SHORT_BYTES,  "SMALLINT",           tsCompressSmallint,  tsDecompressSmallint,  getStatics_i16},
@@ -376,9 +376,9 @@ tDataTypeDescriptor tDataTypes[15] = {
   {TSDB_DATA_TYPE_BIGINT,    6,  LONG_BYTES,   "BIGINT",             tsCompressBigint,    tsDecompressBigint,    getStatics_i64},
   {TSDB_DATA_TYPE_FLOAT,     5,  FLOAT_BYTES,  "FLOAT",              tsCompressFloat,     tsDecompressFloat,     getStatics_f},
   {TSDB_DATA_TYPE_DOUBLE,    6,  DOUBLE_BYTES, "DOUBLE",             tsCompressDouble,    tsDecompressDouble,    getStatics_d},
-  {TSDB_DATA_TYPE_BINARY,    6,  0,            "BINARY",             tsCompressString,    tsDecompressString,    getStatics_bin},
+  {TSDB_DATA_TYPE_BINARY,    6,  0,      "BINARY",             tsCompressString,    tsDecompressString,    getStatics_bin},
   {TSDB_DATA_TYPE_TIMESTAMP, 9,  LONG_BYTES,   "TIMESTAMP",          tsCompressTimestamp, tsDecompressTimestamp, getStatics_i64},
-  {TSDB_DATA_TYPE_NCHAR,     5,  8,            "NCHAR",              tsCompressString,    tsDecompressString,    getStatics_nchr},
+  {TSDB_DATA_TYPE_NCHAR,     5,  8,      "NCHAR",              tsCompressString,    tsDecompressString,    getStatics_nchr},
   {TSDB_DATA_TYPE_UTINYINT,  16, CHAR_BYTES,   "TINYINT UNSIGNED",   tsCompressTinyint,   tsDecompressTinyint,   getStatics_u8},
   {TSDB_DATA_TYPE_USMALLINT, 17, SHORT_BYTES,  "SMALLINT UNSIGNED",  tsCompressSmallint,  tsDecompressSmallint,  getStatics_u16},
   {TSDB_DATA_TYPE_UINT,      12, INT_BYTES,    "INT UNSIGNED",       tsCompressInt,       tsDecompressInt,       getStatics_u32},

src/tsdb/src/tsdbMain.c

@@ -15,8 +15,6 @@
 
 // no test file errors here
 #include "tsdbint.h"
-#include "tscompression.h"
-#include "tsdbLog.h"
 
 #define IS_VALID_PRECISION(precision) \
   (((precision) >= TSDB_TIME_PRECISION_MILLI) && ((precision) <= TSDB_TIME_PRECISION_NANO))