Merge branch 'release/v1.6.4.0'

# Conflicts:
#	src/os/windows/src/twindows.c
#	src/system/src/vnodeImport.c
#	src/util/src/tutil.c

.gitignore

@@ -23,5 +23,14 @@ tests/script/
 tests/pytest/
 tests/jenkins/
 tests/hdfs/
-
 *.iml
+*.class
+nmake/
+sln/
+hdfs/
+c/
+taoshebei/
+taosdalipu/
+Target/
+*.failed
+*.sql

CMakeLists.txt

@@ -3,171 +3,252 @@ PROJECT(TDengine)
 
 SET(CMAKE_C_STANDARD 11)
 SET(CMAKE_VERBOSE_MAKEFILE ON)
-SET(TD_ROOT_DIR ${PROJECT_SOURCE_DIR})
 
 #
-# If it is a Linux operating system
+# If need to set debug options
 #   1.Generate debug version:
-#     mkdir debug; cd debug; 
+#     mkdir debug; cd debug;
 #     cmake -DCMAKE_BUILD_TYPE=Debug ..
 #   2.Generate release version:
-#     mkdir release; cd release; 
+#     mkdir release; cd release;
-#     cmake -DCMAKE_BUILD_TYPE=Release .. 
+#     cmake -DCMAKE_BUILD_TYPE=Release ..
+#
+
+#
 # If it is a Windows operating system
 #   1.Use command line tool of VS2013 or higher version
 #     mkdir build; cd build;
 #     cmake -G "NMake Makefiles" ..
 #     nmake install
-#   2.Use the VS development interface tool 
+#   2.Use the VS development interface tool
 #     mkdir build; cd build;
 #     cmake -A x64 ..
 #     open the file named TDengine.sln
 #
 
-# Set macro definitions according to os platform
+IF (NOT DEFINED TD_CLUSTER)
-SET(TD_WINDOWS FALSE)
+  MESSAGE(STATUS "Build the Lite Version")
-SET(TD_LINUX FALSE)
+  SET(TD_CLUSTER FALSE)
-SET(TD_ARM FALSE)
+  SET(TD_LITE TRUE)
-SET(TD_DARWIN FALSE)
 
-IF (${CMAKE_SYSTEM_NAME} MATCHES "Linux")
+  SET(TD_COMMUNITY_DIR ${PROJECT_SOURCE_DIR})
-  
+  MESSAGE(STATUS "Community directory: " ${TD_COMMUNITY_DIR})
-  SET(TD_OS_DIR ${PROJECT_SOURCE_DIR}/src/os/linux)
-  SET(TD_LINUX TRUE)
-  ADD_DEFINITIONS(-DLINUX)
 
-  IF (${CMAKE_CXX_COMPILER_ID} MATCHES "Clang")			
+
-	SET(COMMON_FLAGS "-std=gnu99 -Wall -fPIC -malign-double -g -Wno-char-subscripts -msse4.2 -D_FILE_OFFSET_BITS=64 -D_LARGE_FILE")
+  # Set macro definitions according to os platform
-  ELSE ()
+  SET(TD_LINUX_64 FALSE)
-	SET(COMMON_FLAGS "-std=gnu99 -Wall -fPIC -malign-double -g -Wno-char-subscripts -malign-stringops -msse4.2 -D_FILE_OFFSET_BITS=64 -D_LARGE_FILE")
+  SET(TD_LINUX_32 FALSE)
+  SET(TD_ARM FALSE)
+  SET(TD_ARM_64 FALSE)
+  SET(TD_ARM_32 FALSE)
+  SET(TD_MIPS_64 FALSE)
+  SET(TD_DARWIN_64 FALSE)
+  SET(TD_WINDOWS_64 FALSE)
+
+  # if generate ARM version:
+  #   cmake -DARMVER=arm32 .. or cmake -DARMVER=arm64
+  IF (${ARMVER} MATCHES "arm32")
+    SET(TD_ARM TRUE)
+    SET(TD_ARM_32 TRUE)
+    ADD_DEFINITIONS(-D_TD_ARM_)
+    ADD_DEFINITIONS(-D_TD_ARM_32_)
+  ELSEIF (${ARMVER} MATCHES "arm64")
+    SET(TD_ARM TRUE)
+    SET(TD_ARM_64 TRUE)
+    ADD_DEFINITIONS(-D_TD_ARM_)
+    ADD_DEFINITIONS(-D_TD_ARM_64_)
   ENDIF ()
-  SET(DEBUG_FLAGS "-O0 -DDEBUG")
+
-  SET(RELEASE_FLAGS "-O0")
+  IF (TD_ARM)
-  
+    ADD_DEFINITIONS(-D_TD_ARM_)
-  ADD_DEFINITIONS(-D_REENTRANT -D__USE_POSIX -D_LIBC_REENTRANT)
+    IF (TD_ARM_32)
-  
+      ADD_DEFINITIONS(-D_TD_ARM_32_)
-  IF (${CMAKE_SIZEOF_VOID_P} MATCHES 8)
+    ELSEIF (TD_ARM_64)
-    MESSAGE(STATUS "The current platform is Linux 64-bit")
+      ADD_DEFINITIONS(-D_TD_ARM_64_)
-    ADD_DEFINITIONS(-D_M_X64)
+    ELSE ()
-  ELSE ()
+      EXIT ()
-    MESSAGE(FATAL_ERROR "The current platform is Linux 32-bit, not supported yet")
+    ENDIF ()
-    EXIT ()
   ENDIF ()
-  
+
-ELSEIF (${CMAKE_SYSTEM_NAME} MATCHES "Windows")
+  IF (${CMAKE_SYSTEM_NAME} MATCHES "Linux")
-  SET(CMAKE_GENERATOR "NMake Makefiles" CACHE INTERNAL "" FORCE)
+    IF (${CMAKE_SIZEOF_VOID_P} MATCHES 8)
-  SET(TD_OS_DIR ${PROJECT_SOURCE_DIR}/src/os/windows)
+      SET(TD_LINUX_64 TRUE)
-  SET(TD_WINDOWS TRUE)
+      SET(TD_OS_DIR ${TD_COMMUNITY_DIR}/src/os/linux)
-  ADD_DEFINITIONS(-DWINDOWS)
+      ADD_DEFINITIONS(-D_M_X64)
-  ADD_DEFINITIONS(-D__CLEANUP_C)
+      MESSAGE(STATUS "The current platform is Linux 64-bit")
-  ADD_DEFINITIONS(-DPTW32_STATIC_LIB)
+  ELSEIF (${CMAKE_SIZEOF_VOID_P} MATCHES 4)
-  ADD_DEFINITIONS(-DPTW32_BUILD)
+    IF (TD_ARM)
-  
+      SET(TD_LINUX_32 TRUE)
-  SET(COMMON_FLAGS "/nologo /WX- /Oi /Oy- /Gm- /EHsc /MT /GS /Gy /fp:precise /Zc:wchar_t /Zc:forScope /Gd /errorReport:prompt /analyze-")
+      SET(TD_OS_DIR ${TD_COMMUNITY_DIR}/src/os/linux)
-  SET(DEBUG_FLAGS "/Zi /W3 /GL")
+      #ADD_DEFINITIONS(-D_M_IX86)
-  SET(RELEASE_FLAGS "/W0 /GL")	
+      MESSAGE(STATUS "The current platform is Linux 32-bit")
-  
+    ELSE ()
-  ADD_DEFINITIONS(-D_MBCS -D_CRT_SECURE_NO_DEPRECATE -D_CRT_NONSTDC_NO_DEPRECATE)  
+      MESSAGE(FATAL_ERROR "The current platform is Linux 32-bit, but no ARM not supported yet")
-  
+      EXIT ()
-  IF (${CMAKE_SIZEOF_VOID_P} MATCHES 8)
+    ENDIF ()
-    MESSAGE(STATUS "The current platform is Windows 64-bit")
-    ADD_DEFINITIONS(-D_M_X64)    
   ELSE ()
-    MESSAGE(FATAL_ERROR "The current platform is Windows 32-bit, not supported yet")
+      MESSAGE(FATAL_ERROR "The current platform is Linux neither 32-bit nor 64-bit, not supported yet")
+      EXIT ()
+    ENDIF ()
+  ELSEIF (${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
+    IF (${CMAKE_SIZEOF_VOID_P} MATCHES 8)
+      SET(TD_DARWIN_64 TRUE)
+      SET(TD_OS_DIR ${TD_COMMUNITY_DIR}/src/os/darwin)
+      MESSAGE(STATUS "The current platform is Darwin 64-bit")
+    ELSE ()
+      MESSAGE(FATAL_ERROR "The current platform is Darwin 32-bit, not supported yet")
+      EXIT ()
+    ENDIF ()
+  ELSEIF (${CMAKE_SYSTEM_NAME} MATCHES "Windows")
+    IF (${CMAKE_SIZEOF_VOID_P} MATCHES 8)
+      SET(TD_WINDOWS_64 TRUE)
+      SET(TD_OS_DIR ${TD_COMMUNITY_DIR}/src/os/windows)
+      ADD_DEFINITIONS(-D_M_X64)
+      MESSAGE(STATUS "The current platform is Windows 64-bit")
+    ELSE ()
+      MESSAGE(FATAL_ERROR "The current platform is Windows 32-bit, not supported yet")
+      EXIT ()
+    ENDIF ()
+  ELSE()
+    MESSAGE(FATAL_ERROR "The current platform is not Linux/Darwin/Windows, stop compile")
     EXIT ()
   ENDIF ()
 
-ELSEIF (${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
+  FIND_PROGRAM(TD_MVN_INSTALLED mvn)
-
+  IF (TD_MVN_INSTALLED)
-  SET(TD_OS_DIR ${PROJECT_SOURCE_DIR}/src/os/darwin)
+    MESSAGE(STATUS "MVN is installed and JDBC will be compiled")
-  SET(TD_DARWIN TRUE)
-  ADD_DEFINITIONS(-DDARWIN)
-
-  SET(COMMON_FLAGS "-std=gnu99 -Wall -fPIC -malign-double -g -Wno-char-subscripts -msse4.2 -D_FILE_OFFSET_BITS=64 -D_LARGE_FILE -Wno-unused-variable -Wno-bitfield-constant-conversion")
-  SET(DEBUG_FLAGS "-O0 -DDEBUG")
-  SET(RELEASE_FLAGS "-O0")
-
-  ADD_DEFINITIONS(-D_REENTRANT -D__USE_POSIX -D_LIBC_REENTRANT)
-
-  IF (${CMAKE_SIZEOF_VOID_P} MATCHES 8)
-    MESSAGE(STATUS "The current platform is Darwin 64-bit")
-    ADD_DEFINITIONS(-D_M_X64)
   ELSE ()
-    MESSAGE(FATAL_ERROR "The current platform is Darwin 32-bit, not supported yet")
+    MESSAGE(STATUS "MVN is not installed and JDBC is not compiled")
+  ENDIF ()
+
+  #
+  # debug flag  
+  #
+  # ADD_DEFINITIONS(-D_CHECK_HEADER_FILE_)
+  IF (${MEM_CHECK} MATCHES "true")
+    ADD_DEFINITIONS(-DTAOS_MEM_CHECK)
+  ENDIF ()
+
+  IF (TD_CLUSTER)
+    ADD_DEFINITIONS(-DCLUSTER)
+    ADD_DEFINITIONS(-DTSDB_REPLICA_MAX_NUM=3)
+  ELSE ()
+    ADD_DEFINITIONS(-DLITE)
+    ADD_DEFINITIONS(-DTSDB_REPLICA_MAX_NUM=1)
+  ENDIF ()
+  IF (TD_LINUX_64)
+    SET(DEBUG_FLAGS "-O0 -DDEBUG")
+    SET(RELEASE_FLAGS "-O0")
+    IF (NOT TD_ARM)
+      IF (${CMAKE_CXX_COMPILER_ID} MATCHES "Clang")
+        SET(COMMON_FLAGS "-std=gnu99 -Wall -fPIC -malign-double -g -Wno-char-subscripts -msse4.2 -D_FILE_OFFSET_BITS=64 -D_LARGE_FILE")
+      ELSE ()
+        SET(COMMON_FLAGS "-std=gnu99 -Wall -fPIC -malign-double -g -Wno-char-subscripts -malign-stringops -msse4.2 -D_FILE_OFFSET_BITS=64 -D_LARGE_FILE")
+      ENDIF ()
+    ELSE ()
+      SET(COMMON_FLAGS "-std=gnu99 -Wall -fPIC -g -Wno-char-subscripts -fsigned-char -munaligned-access -fpack-struct=8 -D_FILE_OFFSET_BITS=64 -D_LARGE_FILE")
+    ENDIF ()
+    ADD_DEFINITIONS(-DLINUX)
+    ADD_DEFINITIONS(-D_REENTRANT -D__USE_POSIX -D_LIBC_REENTRANT)
+  ELSEIF (TD_LINUX_32)
+    IF (NOT TD_ARM)
+      EXIT ()
+    ENDIF ()
+    SET(DEBUG_FLAGS "-O0 -DDEBUG")
+    SET(RELEASE_FLAGS "-O0")
+    SET(COMMON_FLAGS "-std=gnu99 -Wall -fPIC -g -Wno-char-subscripts -fsigned-char -munaligned-access -fpack-struct=8 -D_FILE_OFFSET_BITS=64 -D_LARGE_FILE")
+    ADD_DEFINITIONS(-DLINUX)
+    ADD_DEFINITIONS(-D_REENTRANT -D__USE_POSIX -D_LIBC_REENTRANT)
+    ADD_DEFINITIONS(-DUSE_LIBICONV)
+  ELSEIF (TD_WINDOWS_64)
+    SET(CMAKE_GENERATOR "NMake Makefiles" CACHE INTERNAL "" FORCE)
+    SET(COMMON_FLAGS "/nologo /WX- /Oi /Oy- /Gm- /EHsc /MT /GS /Gy /fp:precise /Zc:wchar_t /Zc:forScope /Gd /errorReport:prompt /analyze-")
+    SET(DEBUG_FLAGS "/Zi /W3 /GL")
+    SET(RELEASE_FLAGS "/W0 /GL")
+    ADD_DEFINITIONS(-DWINDOWS)
+    ADD_DEFINITIONS(-D__CLEANUP_C)
+    ADD_DEFINITIONS(-DPTW32_STATIC_LIB)
+    ADD_DEFINITIONS(-DPTW32_BUILD)
+    ADD_DEFINITIONS(-D_MBCS -D_CRT_SECURE_NO_DEPRECATE -D_CRT_NONSTDC_NO_DEPRECATE)
+  ELSEIF (TD_DARWIN_64)
+    SET(COMMON_FLAGS "-std=gnu99 -Wall -fPIC -malign-double -g -Wno-char-subscripts -msse4.2 -D_FILE_OFFSET_BITS=64 -D_LARGE_FILE -Wno-unused-variable -Wno-bitfield-constant-conversion")
+    SET(DEBUG_FLAGS "-O0 -DDEBUG")
+    SET(RELEASE_FLAGS "-O0")
+    ADD_DEFINITIONS(-DDARWIN)
+    ADD_DEFINITIONS(-D_REENTRANT -D__USE_POSIX -D_LIBC_REENTRANT)
+  ELSE ()
+    MESSAGE(FATAL_ERROR "The current platform is not support yet, stop compile")
     EXIT ()
   ENDIF ()
 
-ELSE ()
+  # Set compiler options
-  MESSAGE(FATAL_ERROR "The current platform is not Linux/MAC/Windows, stop compile")
+  SET(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} ${COMMON_FLAGS} ${DEBUG_FLAGS}")
-  EXIT ()
+  SET(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} ${COMMON_FLAGS} ${RELEASE_FLAGS}")
-  
-ENDIF ()
 
-# Set compiler options
+  # Set c++ compiler options
-SET(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} ${COMMON_FLAGS} ${DEBUG_FLAGS}")
+  # SET(COMMON_CXX_FLAGS "${COMMON_FLAGS} -std=c++11")
-SET(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} ${COMMON_FLAGS} ${RELEASE_FLAGS}")
+  # 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 c++ compiler options
+  IF (${CMAKE_BUILD_TYPE} MATCHES "Debug")
-# SET(COMMON_CXX_FLAGS "${COMMON_FLAGS} -std=c++11")
+    MESSAGE(STATUS "Build Debug Version")
-# SET(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} ${COMMON_CXX_FLAGS} ${DEBUG_FLAGS}")
+  ELSEIF (${CMAKE_BUILD_TYPE} MATCHES "Release")
-# SET(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} ${COMMON_CXX_FLAGS} ${RELEASE_FLAGS}")
+    MESSAGE(STATUS "Build Release Version")
-
-IF (${CMAKE_BUILD_TYPE} MATCHES "Debug")
-  MESSAGE(STATUS "Build Debug Version")
-ELSEIF (${CMAKE_BUILD_TYPE} MATCHES "Release")
-  MESSAGE(STATUS "Build Release Version")
-ELSE ()
-  IF (TD_WINDOWS)
-    SET(CMAKE_BUILD_TYPE "Release")
-	MESSAGE(STATUS "Build Release Version")
   ELSE ()
-    SET(CMAKE_BUILD_TYPE "Debug")
+    IF (TD_WINDOWS_64)
-	MESSAGE(STATUS "Build Debug Version")
+      SET(CMAKE_BUILD_TYPE "Release")
-  ENDIF()    
+      MESSAGE(STATUS "Build Release Version in Windows as default")
+    ELSE ()
+      SET(CMAKE_BUILD_TYPE "Debug")
+      MESSAGE(STATUS "Build Debug Version as default")
+    ENDIF()
+  ENDIF ()
+
+  #set output directory
+  SET(LIBRARY_OUTPUT_PATH ${PROJECT_BINARY_DIR}/build/lib)
+  SET(EXECUTABLE_OUTPUT_PATH ${PROJECT_BINARY_DIR}/build/bin)
+  SET(TD_TESTS_OUTPUT_DIR ${PROJECT_BINARY_DIR}/test)
+
+  MESSAGE(STATUS "Operating system dependency directory: " ${TD_OS_DIR})
+  MESSAGE(STATUS "Project source directory: " ${PROJECT_SOURCE_DIR})
+  MESSAGE(STATUS "Project binary files output path: " ${PROJECT_BINARY_DIR})
+  MESSAGE(STATUS "Project executable files output path: " ${EXECUTABLE_OUTPUT_PATH})
+  MESSAGE(STATUS "Project library files output path: " ${LIBRARY_OUTPUT_PATH})
+
+  IF (TD_LINUX_64)
+    SET(TD_MAKE_INSTALL_SH "${TD_COMMUNITY_DIR}/packaging/tools/make_install.sh")
+    INSTALL(CODE "MESSAGE(\"make install script: ${TD_MAKE_INSTALL_SH}\")")
+    INSTALL(CODE "execute_process(COMMAND chmod 777 ${TD_MAKE_INSTALL_SH})")
+    INSTALL(CODE "execute_process(COMMAND ${TD_MAKE_INSTALL_SH} ${TD_COMMUNITY_DIR} ${PROJECT_BINARY_DIR})")
+  ELSEIF (TD_LINUX_32)
+    IF (NOT TD_ARM)
+      EXIT ()
+    ENDIF ()
+    SET(TD_MAKE_INSTALL_SH "${TD_COMMUNITY_DIR}/packaging/tools/make_install.sh")
+    INSTALL(CODE "MESSAGE(\"make install script: ${TD_MAKE_INSTALL_SH}\")")
+    INSTALL(CODE "execute_process(COMMAND chmod 777 ${TD_MAKE_INSTALL_SH})")
+    INSTALL(CODE "execute_process(COMMAND ${TD_MAKE_INSTALL_SH} ${TD_COMMUNITY_DIR} ${PROJECT_BINARY_DIR})")  
+  ELSEIF (TD_WINDOWS_64)
+    SET(CMAKE_INSTALL_PREFIX C:/TDengine)
+    INSTALL(DIRECTORY ${TD_COMMUNITY_DIR}/src/connector/go DESTINATION connector)
+    INSTALL(DIRECTORY ${TD_COMMUNITY_DIR}/src/connector/grafana DESTINATION connector)
+    INSTALL(DIRECTORY ${TD_COMMUNITY_DIR}/src/connector/python DESTINATION connector)
+    INSTALL(DIRECTORY ${TD_COMMUNITY_DIR}/tests/examples DESTINATION .)
+    INSTALL(DIRECTORY ${TD_COMMUNITY_DIR}/packaging/cfg DESTINATION .)
+    INSTALL(FILES ${TD_COMMUNITY_DIR}/src/inc/taos.h DESTINATION include)
+    INSTALL(FILES ${LIBRARY_OUTPUT_PATH}/taos.lib DESTINATION driver)
+    INSTALL(FILES ${LIBRARY_OUTPUT_PATH}/taos.exp DESTINATION driver)
+    INSTALL(FILES ${LIBRARY_OUTPUT_PATH}/taos.dll DESTINATION driver)
+    INSTALL(FILES ${EXECUTABLE_OUTPUT_PATH}/taos.exe DESTINATION .)
+    #INSTALL(TARGETS taos RUNTIME DESTINATION driver)
+    #INSTALL(TARGETS shell RUNTIME DESTINATION .)
+    IF (TD_MVN_INSTALLED)
+      INSTALL(FILES ${LIBRARY_OUTPUT_PATH}/taos-jdbcdriver-1.0.2-dist.jar DESTINATION connector/jdbc)
+    ENDIF ()
+  ENDIF ()
 ENDIF ()
 
-FIND_PROGRAM(TD_MVN_INSTALLED mvn)
-IF (TD_MVN_INSTALLED)
-  MESSAGE(STATUS "MVN is installed and JDBC will be compiled")
-ELSE ()
-  MESSAGE(STATUS "MVN is not installed and JDBC is not compiled")
-ENDIF ()
-
-#set output directory
-SET(LIBRARY_OUTPUT_PATH ${PROJECT_BINARY_DIR}/build/lib)
-SET(EXECUTABLE_OUTPUT_PATH ${PROJECT_BINARY_DIR}/build/bin)
-SET(TD_TESTS_OUTPUT_DIR ${PROJECT_BINARY_DIR}/test)
-
-MESSAGE(STATUS "Operating system dependency directory: " ${TD_OS_DIR})
-MESSAGE(STATUS "Project source directory: " ${PROJECT_SOURCE_DIR})
-MESSAGE(STATUS "Project binary files output path: " ${PROJECT_BINARY_DIR})
-MESSAGE(STATUS "Project executable files output path: " ${EXECUTABLE_OUTPUT_PATH})
-MESSAGE(STATUS "Project library files output path: " ${LIBRARY_OUTPUT_PATH})
-
 ADD_SUBDIRECTORY(deps)
 ADD_SUBDIRECTORY(src)
-ADD_SUBDIRECTORY(tests)
 
-IF (TD_LINUX)
+INCLUDE(CPack)
-  SET(TD_MAKE_INSTALL_SH "${TD_ROOT_DIR}/packaging/tools/make_install.sh")
-  INSTALL(CODE "MESSAGE(\"make install script: ${TD_MAKE_INSTALL_SH}\")")
-  INSTALL(CODE "execute_process(COMMAND chmod 777 ${TD_MAKE_INSTALL_SH})")
-  INSTALL(CODE "execute_process(COMMAND ${TD_MAKE_INSTALL_SH} ${TD_ROOT_DIR} ${PROJECT_BINARY_DIR})")
-ELSEIF (TD_WINDOWS)
-  SET(CMAKE_INSTALL_PREFIX C:/TDengine)
-  INSTALL(DIRECTORY ${TD_ROOT_DIR}/src/connector/go DESTINATION connector)
-  INSTALL(DIRECTORY ${TD_ROOT_DIR}/src/connector/grafana DESTINATION connector)
-  INSTALL(DIRECTORY ${TD_ROOT_DIR}/src/connector/python DESTINATION connector)
-  INSTALL(DIRECTORY ${TD_ROOT_DIR}/tests/examples DESTINATION .)
-  INSTALL(DIRECTORY ${TD_ROOT_DIR}/packaging/cfg DESTINATION .)
-  INSTALL(FILES ${TD_ROOT_DIR}/src/inc/taos.h DESTINATION include)
-  INSTALL(FILES ${LIBRARY_OUTPUT_PATH}/taos.lib DESTINATION driver)
-  INSTALL(FILES ${LIBRARY_OUTPUT_PATH}/taos.exp DESTINATION driver)
-  INSTALL(TARGETS taos RUNTIME DESTINATION driver) 
-  INSTALL(TARGETS shell RUNTIME DESTINATION .)
-  IF (TD_MVN_INSTALLED)
-      INSTALL(FILES ${LIBRARY_OUTPUT_PATH}/taos-jdbcdriver-1.0.2-dist.jar DESTINATION connector/jdbc)
-  ENDIF ()
-ENDIF ()  
-
-INCLUDE(CPack)

deps/CMakeLists.txt

@@ -1,5 +1,4 @@
 CMAKE_MINIMUM_REQUIRED(VERSION 2.8)
-
 PROJECT(TDengine)
 
 ADD_SUBDIRECTORY(zlib-1.2.11)

deps/iconv/CMakeLists.txt

@@ -1,8 +1,7 @@
 CMAKE_MINIMUM_REQUIRED(VERSION 2.8)
-
 PROJECT(TDengine)
 
-IF (TD_WINDOWS)
+IF (TD_WINDOWS_64)
   LIST(APPEND SRC iconv.c)
   LIST(APPEND SRC localcharset.c)
   INCLUDE_DIRECTORIES(.)

deps/pthread/CMakeLists.txt

@@ -1,9 +1,8 @@
 CMAKE_MINIMUM_REQUIRED(VERSION 2.8)
-
 PROJECT(TDengine)
 
-IF (TD_WINDOWS)
+IF (TD_WINDOWS_64)
-  LIST(APPEND SRC pthread.c)
   INCLUDE_DIRECTORIES(.)
+  LIST(APPEND SRC pthread.c)
   ADD_LIBRARY(pthread ${SRC})
 ENDIF ()

deps/regex/CMakeLists.txt

@@ -1,9 +1,8 @@
 CMAKE_MINIMUM_REQUIRED(VERSION 2.8)
-
 PROJECT(TDengine)
 
-IF (TD_WINDOWS)
+IF (TD_WINDOWS_64)
-  LIST(APPEND SRC regex.c)
   INCLUDE_DIRECTORIES(inc .)
+  LIST(APPEND SRC regex.c)
   ADD_LIBRARY(regex ${SRC})
 ENDIF ()  

deps/zlib-1.2.11/CMakeLists.txt

@@ -1,9 +1,8 @@
 CMAKE_MINIMUM_REQUIRED(VERSION 2.8)
-
 PROJECT(TDengine)
 
-IF (TD_LINUX)
+IF (TD_LINUX_64)
-  AUX_SOURCE_DIRECTORY(src SRC)
   INCLUDE_DIRECTORIES(inc)
+  AUX_SOURCE_DIRECTORY(src SRC)
   ADD_LIBRARY(z ${SRC})
 ENDIF ()

deps/zlib-1.2.11/inc/zconf.h

@@ -4,7 +4,7 @@
  */
 
 /* @(#) $Id$ */
-
+//#include <stdint.h>
 #ifndef ZCONF_H
 #define ZCONF_H
 
@@ -238,16 +238,16 @@
 #endif
 
 #ifdef Z_SOLO
-   typedef unsigned long z_size_t;
+   typedef uint64_t z_size_t;
 #else
-#  define z_longlong long long
+#  define z_longlong int64_t
 #  if defined(NO_SIZE_T)
      typedef unsigned NO_SIZE_T z_size_t;
 #  elif defined(STDC)
 #    include <stddef.h>
      typedef size_t z_size_t;
 #  else
-     typedef unsigned long z_size_t;
+     typedef uint64_t z_size_t;
 #  endif
 #  undef z_longlong
 #endif
@@ -391,7 +391,7 @@
 typedef unsigned char  Byte;  /* 8 bits */
 #endif
 typedef unsigned int   uInt;  /* 16 bits or more */
-typedef unsigned long  uLong; /* 32 bits or more */
+typedef uint64_t  uLong; /* 32 bits or more */
 
 #ifdef SMALL_MEDIUM
    /* Borland C/C++ and some old MSC versions ignore FAR inside typedef */
@@ -419,7 +419,7 @@ typedef uLong FAR uLongf;
 #  if (UINT_MAX == 0xffffffffUL)
 #    define Z_U4 unsigned
 #  elif (ULONG_MAX == 0xffffffffUL)
-#    define Z_U4 unsigned long
+#    define Z_U4 uint64_t
 #  elif (USHRT_MAX == 0xffffffffUL)
 #    define Z_U4 unsigned short
 #  endif
@@ -428,7 +428,7 @@ typedef uLong FAR uLongf;
 #ifdef Z_U4
    typedef Z_U4 z_crc_t;
 #else
-   typedef unsigned long z_crc_t;
+   typedef uint64_t z_crc_t;
 #endif
 
 #if 1    /* was set to #if 1 by ./configure */
@@ -501,7 +501,7 @@ typedef uLong FAR uLongf;
 #endif
 
 #ifndef z_off_t
-#  define z_off_t long
+#  define z_off_t int64_t
 #endif
 
 #if !defined(_WIN32) && defined(Z_LARGE64)

deps/zlib-1.2.11/inc/zlib.h

@@ -999,7 +999,7 @@ ZEXTERN int ZEXPORT inflatePrime OF((z_streamp strm,
    stream state was inconsistent.
 */
 
-ZEXTERN long ZEXPORT inflateMark OF((z_streamp strm));
+ZEXTERN int64_t ZEXPORT inflateMark OF((z_streamp strm));
 /*
      This function returns two values, one in the lower 16 bits of the return
    value, and the other in the remaining upper bits, obtained by shifting the
@@ -1890,7 +1890,7 @@ ZEXTERN int            ZEXPORT inflateSyncPoint OF((z_streamp));
 ZEXTERN const z_crc_t FAR * ZEXPORT get_crc_table    OF((void));
 ZEXTERN int            ZEXPORT inflateUndermine OF((z_streamp, int));
 ZEXTERN int            ZEXPORT inflateValidate OF((z_streamp, int));
-ZEXTERN unsigned long  ZEXPORT inflateCodesUsed OF ((z_streamp));
+ZEXTERN uint64_t  ZEXPORT inflateCodesUsed OF ((z_streamp));
 ZEXTERN int            ZEXPORT inflateResetKeep OF((z_streamp));
 ZEXTERN int            ZEXPORT deflateResetKeep OF((z_streamp));
 #if (defined(_WIN32) || defined(__CYGWIN__)) && !defined(Z_SOLO)

deps/zlib-1.2.11/src/adler32.c

@@ -4,7 +4,7 @@
  */
 
 /* @(#) $Id$ */
-
+#include <stdint.h>
 #include "zutil.h"
 
 local uLong adler32_combine_ OF((uLong adler1, uLong adler2, z_off64_t len2));
@@ -26,7 +26,7 @@ local uLong adler32_combine_ OF((uLong adler1, uLong adler2, z_off64_t len2));
    (thank you to John Reiser for pointing this out) */
 #  define CHOP(a) \
     do { \
-        unsigned long tmp = a >> 16; \
+        uint64_t tmp = a >> 16; \
         a &= 0xffffUL; \
         a += (tmp << 4) - tmp; \
     } while (0)
@@ -65,7 +65,7 @@ uLong ZEXPORT adler32_z(adler, buf, len)
     const Bytef *buf;
     z_size_t len;
 {
-    unsigned long sum2;
+    uint64_t sum2;
     unsigned n;
 
     /* split Adler-32 into component sums */
@@ -145,8 +145,8 @@ local uLong adler32_combine_(adler1, adler2, len2)
     uLong adler2;
     z_off64_t len2;
 {
-    unsigned long sum1;
+    uint64_t sum1;
-    unsigned long sum2;
+    uint64_t sum2;
     unsigned rem;
 
     /* for negative len, return invalid adler32 as a clue for debugging */
@@ -163,7 +163,7 @@ local uLong adler32_combine_(adler1, adler2, len2)
     sum2 += ((adler1 >> 16) & 0xffff) + ((adler2 >> 16) & 0xffff) + BASE - rem;
     if (sum1 >= BASE) sum1 -= BASE;
     if (sum1 >= BASE) sum1 -= BASE;
-    if (sum2 >= ((unsigned long)BASE << 1)) sum2 -= ((unsigned long)BASE << 1);
+    if (sum2 >= ((uint64_t)BASE << 1)) sum2 -= ((uint64_t)BASE << 1);
     if (sum2 >= BASE) sum2 -= BASE;
     return sum1 | (sum2 << 16);
 }

deps/zlib-1.2.11/src/compress.c

@@ -4,7 +4,7 @@
  */
 
 /* @(#) $Id$ */
-
+#include <stdint.h>
 #define ZLIB_INTERNAL
 #include "zlib.h"
 

deps/zlib-1.2.11/src/crc32.c

@@ -20,7 +20,7 @@
 
   DYNAMIC_CRC_TABLE and MAKECRCH can be #defined to write out crc32.h.
  */
-
+#include <stdint.h>
 #ifdef MAKECRCH
 #  include <stdio.h>
 #  ifndef DYNAMIC_CRC_TABLE
@@ -35,9 +35,9 @@
 #  define BYFOUR
 #endif
 #ifdef BYFOUR
-   local unsigned long crc32_little OF((unsigned long,
+   local uint64_t crc32_little OF((uint64_t,
                         const unsigned char FAR *, z_size_t));
-   local unsigned long crc32_big OF((unsigned long,
+   local uint64_t crc32_big OF((uint64_t,
                         const unsigned char FAR *, z_size_t));
 #  define TBLS 8
 #else
@@ -45,9 +45,9 @@
 #endif /* BYFOUR */
 
 /* Local functions for crc concatenation */
-local unsigned long gf2_matrix_times OF((unsigned long *mat,
+local uint64_t gf2_matrix_times OF((uint64_t *mat,
-                                         unsigned long vec));
+                                         uint64_t vec));
-local void gf2_matrix_square OF((unsigned long *square, unsigned long *mat));
+local void gf2_matrix_square OF((uint64_t *square, uint64_t *mat));
 local uLong crc32_combine_ OF((uLong crc1, uLong crc2, z_off64_t len2));
 
 
@@ -170,7 +170,7 @@ local void write_table(out, table)
 
     for (n = 0; n < 256; n++)
         fprintf(out, "%s0x%08lxUL%s", n % 5 ? "" : "    ",
-                (unsigned long)(table[n]),
+                (uint64_t)(table[n]),
                 n == 255 ? "\n" : (n % 5 == 4 ? ",\n" : ", "));
 }
 #endif /* MAKECRCH */
@@ -199,8 +199,8 @@ const z_crc_t FAR * ZEXPORT get_crc_table()
 #define DO8 DO1; DO1; DO1; DO1; DO1; DO1; DO1; DO1
 
 /* ========================================================================= */
-unsigned long ZEXPORT crc32_z(crc, buf, len)
+uint64_t ZEXPORT crc32_z(crc, buf, len)
-    unsigned long crc;
+    uint64_t crc;
     const unsigned char FAR *buf;
     z_size_t len;
 {
@@ -234,8 +234,8 @@ unsigned long ZEXPORT crc32_z(crc, buf, len)
 }
 
 /* ========================================================================= */
-unsigned long ZEXPORT crc32(crc, buf, len)
+uint64_t ZEXPORT crc32(crc, buf, len)
-    unsigned long crc;
+    uint64_t crc;
     const unsigned char FAR *buf;
     uInt len;
 {
@@ -263,8 +263,8 @@ unsigned long ZEXPORT crc32(crc, buf, len)
 #define DOLIT32 DOLIT4; DOLIT4; DOLIT4; DOLIT4; DOLIT4; DOLIT4; DOLIT4; DOLIT4
 
 /* ========================================================================= */
-local unsigned long crc32_little(crc, buf, len)
+local uint64_t crc32_little(crc, buf, len)
-    unsigned long crc;
+    uint64_t crc;
     const unsigned char FAR *buf;
     z_size_t len;
 {
@@ -293,7 +293,7 @@ local unsigned long crc32_little(crc, buf, len)
         c = crc_table[0][(c ^ *buf++) & 0xff] ^ (c >> 8);
     } while (--len);
     c = ~c;
-    return (unsigned long)c;
+    return (uint64_t)c;
 }
 
 /* ========================================================================= */
@@ -303,8 +303,8 @@ local unsigned long crc32_little(crc, buf, len)
 #define DOBIG32 DOBIG4; DOBIG4; DOBIG4; DOBIG4; DOBIG4; DOBIG4; DOBIG4; DOBIG4
 
 /* ========================================================================= */
-local unsigned long crc32_big(crc, buf, len)
+local uint64_t crc32_big(crc, buf, len)
-    unsigned long crc;
+    uint64_t crc;
     const unsigned char FAR *buf;
     z_size_t len;
 {
@@ -333,7 +333,7 @@ local unsigned long crc32_big(crc, buf, len)
         c = crc_table[4][(c >> 24) ^ *buf++] ^ (c << 8);
     } while (--len);
     c = ~c;
-    return (unsigned long)(ZSWAP32(c));
+    return (uint64_t)(ZSWAP32(c));
 }
 
 #endif /* BYFOUR */
@@ -341,11 +341,11 @@ local unsigned long crc32_big(crc, buf, len)
 #define GF2_DIM 32      /* dimension of GF(2) vectors (length of CRC) */
 
 /* ========================================================================= */
-local unsigned long gf2_matrix_times(mat, vec)
+local uint64_t gf2_matrix_times(mat, vec)
-    unsigned long *mat;
+    uint64_t *mat;
-    unsigned long vec;
+    uint64_t vec;
 {
-    unsigned long sum;
+    uint64_t sum;
 
     sum = 0;
     while (vec) {
@@ -359,8 +359,8 @@ local unsigned long gf2_matrix_times(mat, vec)
 
 /* ========================================================================= */
 local void gf2_matrix_square(square, mat)
-    unsigned long *square;
+    uint64_t *square;
-    unsigned long *mat;
+    uint64_t *mat;
 {
     int n;
 
@@ -375,9 +375,9 @@ local uLong crc32_combine_(crc1, crc2, len2)
     z_off64_t len2;
 {
     int n;
-    unsigned long row;
+    uint64_t row;
-    unsigned long even[GF2_DIM];    /* even-power-of-two zeros operator */
+    uint64_t even[GF2_DIM];    /* even-power-of-two zeros operator */
-    unsigned long odd[GF2_DIM];     /* odd-power-of-two zeros operator */
+    uint64_t odd[GF2_DIM];     /* odd-power-of-two zeros operator */
 
     /* degenerate case (also disallow negative lengths) */
     if (len2 <= 0)

deps/zlib-1.2.11/src/deflate.c

@@ -48,7 +48,7 @@
  */
 
 /* @(#) $Id$ */
-
+#include <stdint.h>
 #include "deflate.h"
 
 const char deflate_copyright[] =
@@ -430,7 +430,7 @@ int ZEXPORT deflateSetDictionary (strm, dictionary, dictLength)
         fill_window(s);
     }
     s->strstart += s->lookahead;
-    s->block_start = (long)s->strstart;
+    s->block_start = (int64_t)s->strstart;
     s->insert = s->lookahead;
     s->lookahead = 0;
     s->match_length = s->prev_length = MIN_MATCH-1;
@@ -1512,7 +1512,7 @@ local void fill_window(s)
             zmemcpy(s->window, s->window+wsize, (unsigned)wsize - more);
             s->match_start -= wsize;
             s->strstart    -= wsize; /* we now have strstart >= MAX_DIST */
-            s->block_start -= (long) wsize;
+            s->block_start -= (int64_t) wsize;
             slide_hash(s);
             more += wsize;
         }
@@ -1606,7 +1606,7 @@ local void fill_window(s)
    _tr_flush_block(s, (s->block_start >= 0L ? \
                    (charf *)&s->window[(unsigned)s->block_start] : \
                    (charf *)Z_NULL), \
-                (ulg)((long)s->strstart - s->block_start), \
+                (ulg)((int64_t)s->strstart - s->block_start), \
                 (last)); \
    s->block_start = s->strstart; \
    flush_pending(s->strm); \
@@ -1766,12 +1766,12 @@ local block_state deflate_stored(s, flush)
 
     /* If flushing and all input has been consumed, then done. */
     if (flush != Z_NO_FLUSH && flush != Z_FINISH &&
-        s->strm->avail_in == 0 && (long)s->strstart == s->block_start)
+        s->strm->avail_in == 0 && (int64_t)s->strstart == s->block_start)
         return block_done;
 
     /* Fill the window with any remaining input. */
     have = s->window_size - s->strstart - 1;
-    if (s->strm->avail_in > have && s->block_start >= (long)s->w_size) {
+    if (s->strm->avail_in > have && s->block_start >= (int64_t)s->w_size) {
         /* Slide the window down. */
         s->block_start -= s->w_size;
         s->strstart -= s->w_size;

deps/zlib-1.2.11/src/deflate.h

@@ -151,7 +151,7 @@ typedef struct internal_state {
      *   hash_shift * MIN_MATCH >= hash_bits
      */
 
-    long block_start;
+    int64_t block_start;
     /* Window position at the beginning of the current output block. Gets
      * negative when the window is moved backwards.
      */

deps/zlib-1.2.11/src/gzclose.c

@@ -2,7 +2,7 @@
  * Copyright (C) 2004, 2010 Mark Adler
  * For conditions of distribution and use, see copyright notice in zlib.h
  */
-
+#include <stdint.h>
 #include "gzguts.h"
 
 /* gzclose() is in a separate file so that it is linked in only if it is used.

deps/zlib-1.2.11/src/gzlib.c

@@ -2,7 +2,7 @@
  * Copyright (C) 2004-2017 Mark Adler
  * For conditions of distribution and use, see copyright notice in zlib.h
  */
-
+#include <stdint.h>
 #include "gzguts.h"
 
 #if defined(_WIN32) && !defined(__BORLANDC__) && !defined(__MINGW32__)

deps/zlib-1.2.11/src/gzread.c

@@ -2,7 +2,7 @@
  * Copyright (C) 2004, 2005, 2010, 2011, 2012, 2013, 2016 Mark Adler
  * For conditions of distribution and use, see copyright notice in zlib.h
  */
-
+#include <stdint.h>
 #include "gzguts.h"
 
 /* Local functions */

deps/zlib-1.2.11/src/gzwrite.c

@@ -2,7 +2,7 @@
  * Copyright (C) 2004-2017 Mark Adler
  * For conditions of distribution and use, see copyright notice in zlib.h
  */
-
+#include <stdint.h>
 #include "gzguts.h"
 
 /* Local functions */

deps/zlib-1.2.11/src/infback.c

@@ -9,7 +9,7 @@
    with inffast.c is retained so that optimized assembler-coded versions of
    inflate_fast() can be used with either inflate.c or infback.c.
  */
-
+#include <stdint.h>
 #include "zutil.h"
 #include "inftrees.h"
 #include "inflate.h"
@@ -173,7 +173,7 @@ struct inflate_state FAR *state;
     do { \
         PULL(); \
         have--; \
-        hold += (unsigned long)(*next++) << bits; \
+        hold += (uint64_t)(*next++) << bits; \
         bits += 8; \
     } while (0)
 
@@ -258,7 +258,7 @@ void FAR *out_desc;
     z_const unsigned char FAR *next;    /* next input */
     unsigned char FAR *put;     /* next output */
     unsigned have, left;        /* available input and output */
-    unsigned long hold;         /* bit buffer */
+    uint64_t hold;         /* bit buffer */
     unsigned bits;              /* bits in bit buffer */
     unsigned copy;              /* number of stored or match bytes to copy */
     unsigned char FAR *from;    /* where to copy match bytes from */

deps/zlib-1.2.11/src/inffast.c

@@ -2,7 +2,7 @@
  * Copyright (C) 1995-2017 Mark Adler
  * For conditions of distribution and use, see copyright notice in zlib.h
  */
-
+#include <stdint.h>
 #include "zutil.h"
 #include "inftrees.h"
 #include "inflate.h"
@@ -64,7 +64,7 @@ unsigned start;         /* inflate()'s starting value for strm->avail_out */
     unsigned whave;             /* valid bytes in the window */
     unsigned wnext;             /* window write index */
     unsigned char FAR *window;  /* allocated sliding window, if wsize != 0 */
-    unsigned long hold;         /* local strm->hold */
+    uint64_t hold;         /* local strm->hold */
     unsigned bits;              /* local strm->bits */
     code const FAR *lcode;      /* local strm->lencode */
     code const FAR *dcode;      /* local strm->distcode */
@@ -102,9 +102,9 @@ unsigned start;         /* inflate()'s starting value for strm->avail_out */
        input data or output space */
     do {
         if (bits < 15) {
-            hold += (unsigned long)(*in++) << bits;
+            hold += (uint64_t)(*in++) << bits;
             bits += 8;
-            hold += (unsigned long)(*in++) << bits;
+            hold += (uint64_t)(*in++) << bits;
             bits += 8;
         }
         here = lcode[hold & lmask];
@@ -124,7 +124,7 @@ unsigned start;         /* inflate()'s starting value for strm->avail_out */
             op &= 15;                           /* number of extra bits */
             if (op) {
                 if (bits < op) {
-                    hold += (unsigned long)(*in++) << bits;
+                    hold += (uint64_t)(*in++) << bits;
                     bits += 8;
                 }
                 len += (unsigned)hold & ((1U << op) - 1);
@@ -133,9 +133,9 @@ unsigned start;         /* inflate()'s starting value for strm->avail_out */
             }
             Tracevv((stderr, "inflate:         length %u\n", len));
             if (bits < 15) {
-                hold += (unsigned long)(*in++) << bits;
+                hold += (uint64_t)(*in++) << bits;
                 bits += 8;
-                hold += (unsigned long)(*in++) << bits;
+                hold += (uint64_t)(*in++) << bits;
                 bits += 8;
             }
             here = dcode[hold & dmask];
@@ -148,10 +148,10 @@ unsigned start;         /* inflate()'s starting value for strm->avail_out */
                 dist = (unsigned)(here.val);
                 op &= 15;                       /* number of extra bits */
                 if (bits < op) {
-                    hold += (unsigned long)(*in++) << bits;
+                    hold += (uint64_t)(*in++) << bits;
                     bits += 8;
                     if (bits < op) {
-                        hold += (unsigned long)(*in++) << bits;
+                        hold += (uint64_t)(*in++) << bits;
                         bits += 8;
                     }
                 }

deps/zlib-1.2.11/src/inflate.c

@@ -79,7 +79,7 @@
  *
  * The history for versions after 1.2.0 are in ChangeLog in zlib distribution.
  */
-
+#include <stdint.h>
 #include "zutil.h"
 #include "inftrees.h"
 #include "inflate.h"
@@ -507,7 +507,7 @@ unsigned copy;
     do { \
         if (have == 0) goto inf_leave; \
         have--; \
-        hold += (unsigned long)(*next++) << bits; \
+        hold += (uint64_t)(*next++) << bits; \
         bits += 8; \
     } while (0)
 
@@ -627,7 +627,7 @@ int flush;
     z_const unsigned char FAR *next;    /* next input */
     unsigned char FAR *put;     /* next output */
     unsigned have, left;        /* available input and output */
-    unsigned long hold;         /* bit buffer */
+    uint64_t hold;         /* bit buffer */
     unsigned bits;              /* bits in bit buffer */
     unsigned in, out;           /* save starting available input and output */
     unsigned copy;              /* number of stored or match bytes to copy */
@@ -1317,7 +1317,7 @@ const Bytef *dictionary;
 uInt dictLength;
 {
     struct inflate_state FAR *state;
-    unsigned long dictid;
+    uint64_t dictid;
     int ret;
 
     /* check state */
@@ -1401,7 +1401,7 @@ int ZEXPORT inflateSync(strm)
 z_streamp strm;
 {
     unsigned len;               /* number of bytes to look at or looked at */
-    unsigned long in, out;      /* temporary to save total_in and total_out */
+    uint64_t in, out;      /* temporary to save total_in and total_out */
     unsigned char buf[4];       /* to restore bit buffer to byte string */
     struct inflate_state FAR *state;
 
@@ -1538,7 +1538,7 @@ int check;
     return Z_OK;
 }
 
-long ZEXPORT inflateMark(strm)
+int64_t ZEXPORT inflateMark(strm)
 z_streamp strm;
 {
     struct inflate_state FAR *state;
@@ -1546,16 +1546,16 @@ z_streamp strm;
     if (inflateStateCheck(strm))
         return -(1L << 16);
     state = (struct inflate_state FAR *)strm->state;
-    return (long)(((unsigned long)((long)state->back)) << 16) +
+    return (int64_t)(((uint64_t)((int64_t)state->back)) << 16) +
         (state->mode == COPY ? state->length :
             (state->mode == MATCH ? state->was - state->length : 0));
 }
 
-unsigned long ZEXPORT inflateCodesUsed(strm)
+uint64_t ZEXPORT inflateCodesUsed(strm)
 z_streamp strm;
 {
     struct inflate_state FAR *state;
-    if (inflateStateCheck(strm)) return (unsigned long)-1;
+    if (inflateStateCheck(strm)) return (uint64_t)-1;
     state = (struct inflate_state FAR *)strm->state;
-    return (unsigned long)(state->next - state->codes);
+    return (uint64_t)(state->next - state->codes);
 }

deps/zlib-1.2.11/src/inflate.h

@@ -88,8 +88,8 @@ struct inflate_state {
     int havedict;               /* true if dictionary provided */
     int flags;                  /* gzip header method and flags (0 if zlib) */
     unsigned dmax;              /* zlib header max distance (INFLATE_STRICT) */
-    unsigned long check;        /* protected copy of check value */
+    uint64_t check;        /* protected copy of check value */
-    unsigned long total;        /* protected copy of output count */
+    uint64_t total;        /* protected copy of output count */
     gz_headerp head;            /* where to save gzip header information */
         /* sliding window */
     unsigned wbits;             /* log base 2 of requested window size */
@@ -98,7 +98,7 @@ struct inflate_state {
     unsigned wnext;             /* window write index */
     unsigned char FAR *window;  /* allocated sliding window, if needed */
         /* bit accumulator */
-    unsigned long hold;         /* input bit accumulator */
+    uint64_t hold;         /* input bit accumulator */
     unsigned bits;              /* number of bits in "in" */
         /* for string and stored block copying */
     unsigned length;            /* literal or length of data to copy */

deps/zlib-1.2.11/src/inftrees.c

@@ -2,7 +2,7 @@
  * Copyright (C) 1995-2017 Mark Adler
  * For conditions of distribution and use, see copyright notice in zlib.h
  */
-
+#include <stdint.h>
 #include "zutil.h"
 #include "inftrees.h"
 

deps/zlib-1.2.11/src/trees.c

@@ -33,7 +33,7 @@
 /* @(#) $Id$ */
 
 /* #define GEN_TREES_H */
-
+#include <stdint.h>
 #include "deflate.h"
 
 #ifdef ZLIB_DEBUG
@@ -1038,7 +1038,7 @@ int ZLIB_INTERNAL _tr_tally (s, dist, lc)
     if ((s->last_lit & 0x1fff) == 0 && s->level > 2) {
         /* Compute an upper bound for the compressed length */
         ulg out_length = (ulg)s->last_lit*8L;
-        ulg in_length = (ulg)((long)s->strstart - s->block_start);
+        ulg in_length = (ulg)((int64_t)s->strstart - s->block_start);
         int dcode;
         for (dcode = 0; dcode < D_CODES; dcode++) {
             out_length += (ulg)s->dyn_dtree[dcode].Freq *
@@ -1128,7 +1128,7 @@ local int detect_data_type(s)
      * set bits 0..6, 14..25, and 28..31
      * 0xf3ffc07f = binary 11110011111111111100000001111111
      */
-    unsigned long black_mask = 0xf3ffc07fUL;
+    uint64_t black_mask = 0xf3ffc07fUL;
     int n;
 
     /* Check for non-textual ("black-listed") bytes. */

deps/zlib-1.2.11/src/uncompr.c

@@ -4,7 +4,7 @@
  */
 
 /* @(#) $Id$ */
-
+#include <stdint.h>
 #define ZLIB_INTERNAL
 #include "zlib.h"
 

deps/zlib-1.2.11/src/zconf.h

@@ -238,16 +238,16 @@
 #endif
 
 #ifdef Z_SOLO
-   typedef unsigned long z_size_t;
+   typedef uint64_t z_size_t;
 #else
-#  define z_longlong long long
+#  define z_longlong int64_t
 #  if defined(NO_SIZE_T)
      typedef unsigned NO_SIZE_T z_size_t;
 #  elif defined(STDC)
 #    include <stddef.h>
      typedef size_t z_size_t;
 #  else
-     typedef unsigned long z_size_t;
+     typedef uint64_t z_size_t;
 #  endif
 #  undef z_longlong
 #endif
@@ -391,7 +391,7 @@
 typedef unsigned char  Byte;  /* 8 bits */
 #endif
 typedef unsigned int   uInt;  /* 16 bits or more */
-typedef unsigned long  uLong; /* 32 bits or more */
+typedef uint64_t  uLong; /* 32 bits or more */
 
 #ifdef SMALL_MEDIUM
    /* Borland C/C++ and some old MSC versions ignore FAR inside typedef */
@@ -419,7 +419,7 @@ typedef uLong FAR uLongf;
 #  if (UINT_MAX == 0xffffffffUL)
 #    define Z_U4 unsigned
 #  elif (ULONG_MAX == 0xffffffffUL)
-#    define Z_U4 unsigned long
+#    define Z_U4 uint64_t
 #  elif (USHRT_MAX == 0xffffffffUL)
 #    define Z_U4 unsigned short
 #  endif
@@ -428,7 +428,7 @@ typedef uLong FAR uLongf;
 #ifdef Z_U4
    typedef Z_U4 z_crc_t;
 #else
-   typedef unsigned long z_crc_t;
+   typedef uint64_t z_crc_t;
 #endif
 
 #if 1    /* was set to #if 1 by ./configure */
@@ -501,7 +501,7 @@ typedef uLong FAR uLongf;
 #endif
 
 #ifndef z_off_t
-#  define z_off_t long
+#  define z_off_t int64_t
 #endif
 
 #if !defined(_WIN32) && defined(Z_LARGE64)

deps/zlib-1.2.11/src/zlib.h

@@ -999,7 +999,7 @@ ZEXTERN int ZEXPORT inflatePrime OF((z_streamp strm,
    stream state was inconsistent.
 */
 
-ZEXTERN long ZEXPORT inflateMark OF((z_streamp strm));
+ZEXTERN int64_t ZEXPORT inflateMark OF((z_streamp strm));
 /*
      This function returns two values, one in the lower 16 bits of the return
    value, and the other in the remaining upper bits, obtained by shifting the
@@ -1890,7 +1890,7 @@ ZEXTERN int            ZEXPORT inflateSyncPoint OF((z_streamp));
 ZEXTERN const z_crc_t FAR * ZEXPORT get_crc_table    OF((void));
 ZEXTERN int            ZEXPORT inflateUndermine OF((z_streamp, int));
 ZEXTERN int            ZEXPORT inflateValidate OF((z_streamp, int));
-ZEXTERN unsigned long  ZEXPORT inflateCodesUsed OF ((z_streamp));
+ZEXTERN uint64_t  ZEXPORT inflateCodesUsed OF ((z_streamp));
 ZEXTERN int            ZEXPORT inflateResetKeep OF((z_streamp));
 ZEXTERN int            ZEXPORT deflateResetKeep OF((z_streamp));
 #if (defined(_WIN32) || defined(__CYGWIN__)) && !defined(Z_SOLO)

deps/zlib-1.2.11/src/zutil.c

@@ -4,7 +4,7 @@
  */
 
 /* @(#) $Id$ */
-
+#include <stdint.h>
 #include "zutil.h"
 #ifndef Z_SOLO
 #  include "gzguts.h"
@@ -280,7 +280,7 @@ void ZLIB_INTERNAL zcfree (voidpf opaque, voidpf ptr)
 voidpf ZLIB_INTERNAL zcalloc (voidpf opaque, uInt items, uInt size)
 {
     (void)opaque;
-    return _halloc((long)items, size);
+    return _halloc((int64_t)items, size);
 }
 
 void ZLIB_INTERNAL zcfree (voidpf opaque, voidpf ptr)

deps/zlib-1.2.11/src/zutil.h

@@ -30,7 +30,7 @@
 #endif
 
 #ifdef Z_SOLO
-   typedef long ptrdiff_t;  /* guess -- will be caught if guess is wrong */
+   typedef int64_t ptrdiff_t;  /* guess -- will be caught if guess is wrong */
 #endif
 
 #ifndef local
@@ -44,7 +44,7 @@ typedef unsigned char  uch;
 typedef uch FAR uchf;
 typedef unsigned short ush;
 typedef ush FAR ushf;
-typedef unsigned long  ulg;
+typedef uint64_t  ulg;
 
 extern z_const char * const z_errmsg[10]; /* indexed by 2-zlib_error */
 /* (size given to avoid silly warnings with Visual C++) */
@@ -89,7 +89,7 @@ extern z_const char * const z_errmsg[10]; /* indexed by 2-zlib_error */
 #      if (__STDC__ == 1) && (defined(__LARGE__) || defined(__COMPACT__))
          /* Allow compilation with ANSI keywords only enabled */
          void _Cdecl farfree( void *block );
-         void *_Cdecl farmalloc( unsigned long nbytes );
+         void *_Cdecl farmalloc( uint64_t nbytes );
 #      else
 #        include <alloc.h>
 #      endif

documentation/tdenginedocs-cn/getting-started/index.html

@@ -63,7 +63,7 @@ Query OK, 2 row(s) in set (0.001700s)</code></pre>
 <a class='anchor' id='主要功能'></a><h2>主要功能</h2>
 <p>TDengine的核心功能是时序数据库。除此之外，为减少研发的复杂度、系统维护的难度，TDengine还提供缓存、消息队列、订阅、流式计算等功能。更详细的功能如下：</p>
 <ul>
-<li>使用类SQL语言用插入或查询数据</li>
+<li>使用类SQL语言插入或查询数据</li>
 <li>支持C/C++, Java(JDBC), Python, Go, RESTful, and Node.JS 开发接口</li>
 <li>可通过Python/R/Matlab or TDengine shell做Ad Hoc查询分析</li>
 <li>通过定时连续查询支持基于滑动窗口的流式计算</li>

documentation/tdenginedocs-cn/super-table/index.html

@@ -24,7 +24,7 @@ tags (location binary(20), type int)</code></pre>
 <p>说明：</p>
 <ol>
 <li>TAGS列总长度不能超过512 bytes；</li>
-<li>TAGS列的数据类型不能是timestamp和nchar类型；</li>
+<li>TAGS列的数据类型不能是timestamp类型；</li>
 <li>TAGS列名不能与其他列名相同;</li>
 <li>TAGS列名不能为预留关键字. </li></ol></li>
 <li><p>显示已创建的超级表</p>
@@ -40,7 +40,7 @@ tags (location binary(20), type int)</code></pre>
 <p>统计属于某个STable并满足查询条件的子表的数量</p></li>
 </ul>
 <a class='anchor' id='写数据时自动建子表'></a><h2>写数据时自动建子表</h2>
-<p>在某些特殊场景中，用户在写数据时并不确定某个设备的表是否存在，此时可使用自动建表语法来实现写入数据时里用超级表定义的表结构自动创建不存在的子表，若该表已存在则不会建立新表。注意：自动建表语句只能自动建立子表而不能建立超级表，这就要求超级表已经被事先定义好。自动建表语法跟insert/import语法非常相似，唯一区别是语句中增加了超级表和标签信息。具体语法如下：</p>
+<p>在某些特殊场景中，用户在写数据时并不确定某个设备的表是否存在，此时可使用自动建表语法来实现写入数据时用超级表定义的表结构自动创建不存在的子表，若该表已存在则不会建立新表。注意：自动建表语句只能自动建立子表而不能建立超级表，这就要求超级表已经被事先定义好。自动建表语法跟insert/import语法非常相似，唯一区别是语句中增加了超级表和标签信息。具体语法如下：</p>
 <pre><code class="mysql language-mysql">INSERT INTO &lt;tb_name&gt; USING &lt;stb_name&gt; TAGS (&lt;tag1_value&gt;, ...) VALUES (field_value, ...) (field_value, ...) ...;</code></pre>
 <p>向表tb_name中插入一条或多条记录，如果tb_name这张表不存在，则会用超级表stb_name定义的表结构以及用户指定的标签值(即tag1_value…)来创建名为tb_name新表，并将用户指定的值写入表中。如果tb_name已经存在，则建表过程会被忽略，系统也不会检查tb_name的标签是否与用户指定的标签值一致，也即不会更新已存在表的标签。</p>
 <pre><code class="mysql language-mysql">INSERT INTO &lt;tb1_name&gt; USING &lt;stb1_name&gt; TAGS (&lt;tag1_value1&gt;, ...) VALUES (&lt;field1_value1&gt;, ...) (&lt;field1_value2&gt;, ...) ... &lt;tb_name2&gt; USING &lt;stb_name2&gt; TAGS(&lt;tag1_value2&gt;, ...) VALUES (&lt;field1_value1&gt;, ...) ...;</code></pre>
@@ -105,6 +105,6 @@ GROUP BY location, type </code></pre>
 <p>查询仅位于北京以外地区的温度传感器最近24小时(24h)采样值的数量count(*)、平均温度avg(degree)、最高温度max(degree)和最低温度min(degree)，将采集结果按照10分钟为周期进行聚合，并将结果按所处地域(location)和传感器类型(type)再次进行聚合。</p>
 <pre><code class="mysql language-mysql">SELECT COUNT(*), AVG(degree), MAX(degree), MIN(degree)
 FROM thermometer
-WHERE name&lt;&gt;'beijing' and ts&gt;=now-1d
+WHERE location&lt;&gt;'beijing' and ts&gt;=now-1d
 INTERVAL(10M)
 GROUP BY location, type</code></pre><a href='../index.html'>回去</a></section></main></div><?php include($s.'/footer.php'); ?><script>$('pre').addClass('prettyprint linenums');PR.prettyPrint()</script><script src='lib/docs/liner.js'></script></body></html>

documentation/tdenginedocs-cn/taos-sql/index.html

@@ -359,9 +359,9 @@ SELECT function_list FROM tb_name
 
 SELECT function_list FROM stb_name 
   [WHERE where_condition]
-  [GROUP BY tags]
+  [FILL ({ VALUE | PREV | NULL | LINEAR})]
   INTERVAL (interval)
-  [FILL ({ VALUE | PREV | NULL | LINEAR})]</code></pre>
+  [GROUP BY tags]</code></pre>
 <ul>
 <li>聚合时间段的长度由关键词INTERVAL指定，最短时间间隔10毫秒（10a）。聚合查询中，能够同时执行的聚合和选择函数仅限于单个输出的函数：count、avg、sum 、stddev、leastsquares、percentile、min、max、first、last，不能使用具有多行输出结果的函数（例如：top、bottom、diff以及四则运算）。</li>
 <li>WHERE语句可以指定查询的起止时间和其他过滤条件 </li>

documentation/tdenginedocs-en/super-table/index.html

@@ -6,9 +6,9 @@
 <p>Like a table, you can create, show, delete and describe STables. Most query operations on tables can be applied to STable too, including the aggregation and selector functions. For queries on a STable, if no tags filter, the operations are applied to all the tables created via this STable. If there is a tag filter, the operations are applied only to a subset of the tables which satisfy the tag filter conditions. It will be very convenient to use tags to put devices into different groups for aggregation.</p>
 <a class='anchor' id='Create-a-STable'></a><h2>Create a STable</h2>
 <p>Similiar to creating a standard table, syntax is: </p>
-<pre><code class="mysql language-mysql">CREATE TABLE &lt;stable_name&gt; (&lt;field_name&gt; TIMESTAMP, field_name1 field_type,…) TAGS(tag_name tag_type, …)</code></pre>
+<pre><code class="mysql language-mysql">CREATE TABLE &lt;stable_name&gt; (&lt;field_name&gt; TIMESTAMP, field_name1 field_type, ...) TAGS(tag_name tag_type, ...)</code></pre>
 <p>New keyword "tags" is introduced, where tag_name is the tag name, and tag_type is the associated data type. </p>
-<p>Note：</p>
+<p>Note: </p>
 <ol>
 <li>The bytes of all tags together shall be less than 512 </li>
 <li>Tag's data type can not be time stamp or nchar</li>
@@ -30,12 +30,12 @@ tags (location binary(20), type int)</code></pre>
  create table t4 using thermometer tags ('shanghai', 20);
  create table t5 using thermometer tags ('new york', 10);</code></pre>
 <a class='anchor' id='Aggregate-Tables-via-STable'></a><h2>Aggregate Tables via STable</h2>
-<p>You can group a set of tables together by specifying the tags filter condition, then apply the aggregation operations. The result set can be grouped and ordered based on tag value. Syntax is：</p>
+<p>You can group a set of tables together by specifying the tags filter condition, then apply the aggregation operations. The result set can be grouped and ordered based on tag value. Syntax is:</p>
-<pre><code class="mysql language-mysql">SELECT function&lt;field_name&gt;,… 
+<pre><code class="mysql language-mysql">SELECT function&lt;field_name&gt;, ... 
  FROM &lt;stable_name&gt; 
- WHERE &lt;tag_name&gt; &lt;[=|&lt;=|&gt;=|&lt;&gt;] values..&gt; ([AND|OR] …)
+ WHERE &lt;tag_name&gt; &lt;[=|&lt;=|&gt;=|&lt;&gt;] values..&gt; ([AND|OR] ...
  INTERVAL (&lt;time range&gt;)
- GROUP BY &lt;tag_name&gt;, &lt;tag_name&gt;…
+ GROUP BY &lt;tag_name&gt;, &lt;tag_name&gt; ... 
  ORDER BY &lt;tag_name&gt; &lt;asc|desc&gt;
  SLIMIT &lt;group_limit&gt;
  SOFFSET &lt;group_offset&gt;
@@ -75,9 +75,9 @@ INTERVAL(10M)</code></pre>
 <pre><code class="mysql language-mysql">DROP TABLE &lt;stable_name&gt;</code></pre>
 <p>To delete a STable, all the tables created via this STable shall be deleted first, otherwise, it will fail.</p>
 <a class='anchor' id='List-the-Associated-Tables-of-a-STable'></a><h3>List the Associated Tables of a STable</h3>
-<pre><code class="mysql language-mysql">SELECT TBNAME,[TAG_NAME,…] FROM &lt;stable_name&gt; WHERE &lt;tag_name&gt; &lt;[=|=&lt;|&gt;=|&lt;&gt;] values..&gt; ([AND|OR] …)</code></pre>
+<pre><code class="mysql language-mysql">SELECT TBNAME,[TAG_NAME, ...] FROM &lt;stable_name&gt; WHERE &lt;tag_name&gt; &lt;[=|=&lt;|&gt;=|&lt;&gt;] values..&gt; ([AND|OR] ...)</code></pre>
 <p>It will list all the tables which satisfy the tag filter conditions. The tables are all created from this specific STable. TBNAME is a new keyword introduced, it is the table name associated with the STable. </p>
-<pre><code class="mysql language-mysql">SELECT COUNT(TBNAME) FROM &lt;stable_name&gt; WHERE &lt;tag_name&gt; &lt;[=|=&lt;|&gt;=|&lt;&gt;] values..&gt; ([AND|OR] …)</code></pre>
+<pre><code class="mysql language-mysql">SELECT COUNT(TBNAME) FROM &lt;stable_name&gt; WHERE &lt;tag_name&gt; &lt;[=|=&lt;|&gt;=|&lt;&gt;] values..&gt; ([AND|OR] ...)</code></pre>
 <p>The above SQL statement will list the number of tables in a STable, which satisfy the filter condition.</p>
 <a class='anchor' id='Management-of-Tags'></a><h2>Management of Tags</h2>
 <p>You can add, delete and change the tags for a STable, and you can change the tag value of a table. The SQL commands are listed below.  </p>

documentation/webdocs/markdowndocs/Connector.md

@@ -8,7 +8,7 @@ C/C++ APIs are similar to the MySQL APIs. Applications should include TDengine h
 ```C
 #include <taos.h>
 ```
-Make sure TDengine library _libtaos.so_ is installed and use _-ltaos_ option to link the library when compiling. The return values of all APIs are _-1_ or _NULL_ for failure.
+Make sure TDengine library _libtaos.so_ is installed and use _-ltaos_ option to link the library when compiling. In most cases, if the return value of an API is integer, it return _0_ for success and other values as an error code for failure; if the return value is pointer, then _NULL_ is used for failure.
 
 
 ### C/C++ sync API
@@ -78,6 +78,51 @@ The 12 APIs are the most important APIs frequently used. Users can check _taos.h
 
 **Note**: The connection to a TDengine server is not multi-thread safe. So a connection can only be used by one thread.
 
+### C/C++ parameter binding API
+
+TDengine also provides parameter binding APIs, like MySQL, only question mark `?` can be used to represent a parameter in these APIs.
+
+- `TAOS_STMT* taos_stmt_init(TAOS *taos)`
+
+  Create a TAOS_STMT to represent the prepared statement for other APIs.
+
+- `int taos_stmt_prepare(TAOS_STMT *stmt, const char *sql, unsigned long length)`
+
+  Parse SQL statement _sql_ and bind result to _stmt_ , if _length_ larger than 0, its value is used to determine the length of _sql_, the API auto detects the actual length of _sql_ otherwise.
+
+- `int taos_stmt_bind_param(TAOS_STMT *stmt, TAOS_BIND *bind)`
+
+  Bind values to parameters. _bind_ points to an array, the element count and sequence of the array must be identical as the parameters of the SQL statement. The usage of _TAOS_BIND_ is same as _MYSQL_BIND_ in MySQL, its definition is as below:
+
+  ```c
+  typedef struct TAOS_BIND {
+    int            buffer_type;
+    void *         buffer;
+    unsigned long  buffer_length;  // not used in TDengine
+    unsigned long *length;
+    int *          is_null;
+    int            is_unsigned;    // not used in TDengine
+    int *          error;          // not used in TDengine
+  } TAOS_BIND;
+  ```
+
+- `int taos_stmt_add_batch(TAOS_STMT *stmt)`
+
+  Add bound parameters to batch, client can call `taos_stmt_bind_param` again after calling this API. Note this API only support _insert_ / _import_ statements, it returns an error in other cases.
+
+- `int taos_stmt_execute(TAOS_STMT *stmt)`
+
+  Execute the prepared statement. This API can only be called once for a statement at present.
+
+- `TAOS_RES* taos_stmt_use_result(TAOS_STMT *stmt)`
+
+  Acquire the result set of an executed statement. The usage of the result is same as `taos_use_result`, `taos_free_result` must be called after one you are done with the result set to release resources.
+
+- `int taos_stmt_close(TAOS_STMT *stmt)`
+
+  Close the statement, release all resources.
+
+
 ### C/C++ async API
 
 In addition to sync APIs, TDengine also provides async APIs, which are more efficient. Async APIs are returned right away without waiting for a response from the server, allowing the application to continute with other tasks without blocking. So async APIs are more efficient, especially useful when in a poor network.

documentation/webdocs/markdowndocs/Super Table-ch.md

@@ -54,7 +54,7 @@ STable从属于库，一个STable只属于一个库，但一个库可以有一
     说明：
 
     1. TAGS列总长度不能超过512 bytes；
-    2. TAGS列的数据类型不能是timestamp和nchar类型；
+    2. TAGS列的数据类型不能是timestamp；
     3. TAGS列名不能与其他列名相同;
     4. TAGS列名不能为预留关键字. 
 
@@ -169,7 +169,7 @@ SELECT function<field_name>,…
 
 以温度传感器采集时序数据作为例，示范STable的使用。 在这个例子中，对每个温度计都会建立一张表，表名为温度计的ID，温度计读数的时刻记为ts，采集的值记为degree。通过tags给每个采集器打上不同的标签，其中记录温度计的地区和类型，以方便我们后面的查询。所有温度计的采集量都一样，因此我们用STable来定义表结构。
 
-###定义STable表结构并使用它创建子表
+###1:定义STable表结构并使用它创建子表
 
 创建STable语句如下：
 
@@ -189,7 +189,7 @@ CREATE TABLE therm4 USING thermometer TAGS ('shanghai', 3);
 
 其中therm1，therm2，therm3，therm4是超级表thermometer四个具体的子表，也即普通的Table。以therm1为例，它表示采集器therm1的数据，表结构完全由thermometer定义，标签location=”beijing”, type=1表示therm1的地区是北京，类型是第1类的温度计。
 
-###写入数据
+###2:写入数据
 
 注意，写入数据时不能直接对STable操作，而是要对每张子表进行操作。我们分别向四张表therm1，therm2， therm3， therm4写入一条数据，写入语句如下：
 
@@ -200,7 +200,7 @@ INSERT INTO therm3 VALUES ('2018-01-01 00:00:00.000', 24);
 INSERT INTO therm4 VALUES ('2018-01-01 00:00:00.000', 23);
 ```
 
-### 按标签聚合查询
+###3:按标签聚合查询
 
 查询位于北京(beijing)和天津(tianjing)两个地区的温度传感器采样值的数量count(*)、平均温度avg(degree)、最高温度max(degree)、最低温度min(degree)，并将结果按所处地域(location)和传感器类型(type)进行聚合。
 
@@ -211,14 +211,14 @@ WHERE location='beijing' or location='tianjin'
 GROUP BY location, type 
 ```
 
-### 按时间周期聚合查询
+###4:按时间周期聚合查询
 
 查询仅位于北京以外地区的温度传感器最近24小时(24h)采样值的数量count(*)、平均温度avg(degree)、最高温度max(degree)和最低温度min(degree)，将采集结果按照10分钟为周期进行聚合，并将结果按所处地域(location)和传感器类型(type)再次进行聚合。
 
 ```mysql
 SELECT COUNT(*), AVG(degree), MAX(degree), MIN(degree)
 FROM thermometer
-WHERE name<>'beijing' and ts>=now-1d
+WHERE location<>'beijing' and ts>=now-1d
 INTERVAL(10M)
 GROUP BY location, type
 ```

documentation/webdocs/markdowndocs/Super Table.md

@@ -23,7 +23,7 @@ New keyword "tags" is introduced, where tag_name is the tag name, and tag_type i
 Note：
 
 1. The bytes of all tags together shall be less than 512 
-2. Tag's data type can not be time stamp or nchar
+2. Tag's data type can not be time stamp
 3. Tag name shall be different from the field name
 4. Tag name shall not be the same as system keywords
 5. Maximum number of tags is 6 
@@ -102,7 +102,7 @@ List the number of records, average, maximum, and minimum temperature every 10 m
 ```mysql
 SELECT COUNT(*), AVG(degree), MAX(degree), MIN(degree)
 FROM thermometer
-WHERE name='beijing' and type=10 and ts>=now-1d
+WHERE location='beijing' and type=10 and ts>=now-1d
 INTERVAL(10M)
 ```
 

documentation/webdocs/markdowndocs/TAOS SQL-ch.md

@@ -424,9 +424,9 @@ SELECT function_list FROM tb_name
 
 SELECT function_list FROM stb_name 
   [WHERE where_condition]
-  [GROUP BY tags]
   INTERVAL (interval)
   [FILL ({ VALUE | PREV | NULL | LINEAR})]
+  [GROUP BY tags]
 ```
 
 - 聚合时间段的长度由关键词INTERVAL指定，最短时间间隔10毫秒（10a）。聚合查询中，能够同时执行的聚合和选择函数仅限于单个输出的函数：count、avg、sum 、stddev、leastsquares、percentile、min、max、first、last，不能使用具有多行输出结果的函数（例如：top、bottom、diff以及四则运算）。

documentation/webdocs/markdowndocs/TAOS SQL.md

@@ -474,9 +474,9 @@ SELECT function_list FROM tb_name
 
 SELECT function_list FROM stb_name 
   [WHERE where_condition]
-  [GROUP BY tags]
   INTERVAL (interval)
   [FILL ({ VALUE | PREV | NULL | LINEAR})]
+  [GROUP BY tags]
 ```
 
 The downsampling time window is defined by `interval`, which is at least 10 milliseconds. The query returns a new series of downsampled data that has a series of fixed timestamps with an increment of `interval`. 

documentation/webdocs/markdowndocs/connector-ch.md

@@ -4,13 +4,13 @@ TDengine提供了丰富的应用程序开发接口，其中包括C/C++、JAVA、
 
 ## C/C++ Connector
 
-C/C++的API类似于MySQL的C API。应用程序使用时，需要包含TDengine头文件 _taos.h_（安装后，位于_/usr/local/taos/include_）：
+C/C++的API类似于MySQL的C API。应用程序使用时，需要包含TDengine头文件 _taos.h_（安装后，位于 _/usr/local/taos/include_）：
 
 ```C
 #include <taos.h>
 ```
 
-在编译时需要链接TDengine动态库_libtaos.so_（安装后，位于/usr/local/taos/driver，gcc编译时，请加上 -ltaos）。 所有API都以返回_-1_或_NULL_均表示失败。
+在编译时需要链接TDengine动态库 _libtaos.so_ （安装后，位于 _/usr/local/taos/driver_，gcc编译时，请加上 -ltaos）。 如未特别说明，当API的返回值是整数时，_0_ 代表成功，其它是代表失败原因的错误码，当返回值是指针时， _NULL_ 表示失败。
 
 ### C/C++同步API
 
@@ -79,6 +79,51 @@ C/C++的API类似于MySQL的C API。应用程序使用时，需要包含TDengine
 
 **注意**：对于单个数据库连接，在同一时刻只能有一个线程使用该链接调用API，否则会有未定义的行为出现并可能导致客户端crash。客户端应用可以通过建立多个连接进行多线程的数据写入或查询处理。
 
+### C/C++ 参数绑定接口
+
+除了直接调用 `taos_query` 进行查询，TDengine也提供了支持参数绑定的Prepare API，与 MySQL 一样，这些API目前也仅支持用问号`?`来代表待绑定的参数，具体如下：
+
+- `TAOS_STMT* taos_stmt_init(TAOS *taos)`
+
+  创建一个 TAOS_STMT 对象用于后续调用。
+
+- `int taos_stmt_prepare(TAOS_STMT *stmt, const char *sql, unsigned long length)`
+
+  解析一条sql语句，将解析结果和参数信息绑定到stmt上，如果参数length大于0，将使用此此参数作为sql语句的长度，如等于0，将自动判断sql语句的长度。
+
+- `int taos_stmt_bind_param(TAOS_STMT *stmt, TAOS_BIND *bind)`
+
+  进行参数绑定，bind指向一个数组，需保证此数组的元素数量和顺序与sql语句中的参数完全一致。TAOS_BIND 的使用方法与 MySQL中的 MYSQL_BIND 一致，具体定义如下：
+
+  ```c
+  typedef struct TAOS_BIND {
+    int            buffer_type;
+    void *         buffer;
+    unsigned long  buffer_length;  // 未实际使用
+    unsigned long *length;
+    int *          is_null;
+    int            is_unsigned;    // 未实际使用
+    int *          error;          // 未实际使用
+  } TAOS_BIND;
+  ```
+
+- `int taos_stmt_add_batch(TAOS_STMT *stmt)`
+
+  将当前绑定的参数加入批处理中，调用此函数后，可以再次调用`taos_stmt_bind_param`绑定新的参数。需要注意，此函数仅支持 insert/import 语句，如果是select等其他SQL语句，将返回错误。
+
+- `int taos_stmt_execute(TAOS_STMT *stmt)`
+
+  执行准备好的语句。目前，一条语句只能执行一次。
+
+- `TAOS_RES* taos_stmt_use_result(TAOS_STMT *stmt)`
+
+  获取语句的结果集。结果集的使用方式与非参数化调用时一致，使用完成后，应对此结果集调用 `taos_free_result`以释放资源。
+  
+- `int taos_stmt_close(TAOS_STMT *stmt)`
+
+  执行完毕，释放所有资源。
+
+
 ### C/C++异步API
 
 同步API之外，TDengine还提供性能更高的异步调用API处理数据插入、查询操作。在软硬件环境相同的情况下，异步API处理数据插入的速度比同步API快2~4倍。异步API采用非阻塞式的调用方式，在系统真正完成某个具体数据库操作前，立即返回。调用的线程可以去处理其他工作，从而可以提升整个应用的性能。异步API在网络延迟严重的情况下，优点尤为突出。
@@ -224,13 +269,14 @@ public Connection getConn() throws Exception{
 
 用户可以在源代码的src/connector/python文件夹下找到python2和python3的安装包。用户可以通过pip命令安装： 
 
-​		`pip install src/connector/python/python2/`
+​		`pip install src/connector/python/[linux|windows]/python2/`
 
 或
 
-​		`pip install src/connector/python/python3/`
+​		`pip install src/connector/python/[linux|windows]/python3/`
 
 如果机器上没有pip命令，用户可将src/connector/python/python3或src/connector/python/python2下的taos文件夹拷贝到应用程序的目录使用。
+对于windows 客户端，安装TDengine windows 客户端后，将C:\TDengine\driver\taos.dll拷贝到C:\windows\system32目录下即可。所有TDengine的连接器，均需依赖taos.dll。
 
 ### Python客户端接口
 

packaging/cfg/taos.cfg

@@ -58,6 +58,12 @@
 # The server and client should have the same socket type. Otherwise, connect will fail.
 # sockettype            udp
 
+# The compressed rpc message, option:
+#  -1 (no compression)
+#   0 (all message compressed),
+# > 0 (rpc message body which larger than this value will be compressed)
+# compressMsgSize       -1
+
 # RPC re-try timer, millisecond
 # rpcTimer              300
 
@@ -131,10 +137,10 @@
 # maxVnodeConnections   10000
 
 # start http service in the cluster
-# enableHttp            1
+# http                  1
 
 # start system monitor module in the cluster
-# enableMonitor         1
+# monitor               1
 
 # number of threads used to process http requests
 # httpMaxThreads        2

packaging/deb/DEBIAN/preinst

@@ -9,13 +9,13 @@ fi
 if pidof taosd &> /dev/null; then
     if pidof systemd &> /dev/null; then
         ${csudo} systemctl stop taosd || :
-    elif $(which insserv &> /dev/null); then
+    elif $(which service  &> /dev/null); then
-        ${csudo} service taosd stop || :
-    elif $(which update-rc.d &> /dev/null); then
         ${csudo} service taosd stop || :
     else
         pid=$(ps -ef | grep "taosd" | grep -v "grep" | awk '{print $2}')
-        ${csudo} kill -9 ${pid}   || :
+        if [ -n "$pid" ]; then
+           ${csudo} kill -9 $pid   || :
+        fi
     fi
     echo "Stop taosd service success!"
     sleep 1

packaging/deb/DEBIAN/prerm

@@ -35,6 +35,8 @@ else
     ${csudo} rm -f ${data_link_dir}           || :
     
     pid=$(ps -ef | grep "taosd" | grep -v "grep" | awk '{print $2}')
-    ${csudo} kill -9 ${pid}   || :
+    if [ -n "$pid" ]; then
+        ${csudo} kill -9 $pid   || :
+    fi
 fi
 

packaging/deb/makedeb.sh

@@ -1,7 +1,7 @@
 #!/bin/bash
 #
 # Generate deb package for ubuntu
-#set -x
+# set -x
 
 #curr_dir=$(pwd)
 compile_dir=$1
@@ -24,8 +24,7 @@ fi
 mkdir -p ${pkg_dir}
 cd ${pkg_dir}
 
-versioninfo=$(${script_dir}/../tools/get_version.sh)
+libfile="libtaos.so.${tdengine_ver}"
-libfile="libtaos.so.${versioninfo}"
 
 # create install dir 
 install_home_path="/usr/local/taos"
@@ -49,6 +48,7 @@ cp ${compile_dir}/build/bin/taosd                   ${pkg_dir}${install_home_pat
 cp ${compile_dir}/build/bin/taos                    ${pkg_dir}${install_home_path}/bin
 cp ${compile_dir}/build/lib/${libfile}              ${pkg_dir}${install_home_path}/driver 
 cp ${compile_dir}/../src/inc/taos.h                 ${pkg_dir}${install_home_path}/include
+cp ${compile_dir}/../src/inc/taoserror.h            ${pkg_dir}${install_home_path}/include
 cp -r ${top_dir}/tests/examples/*                   ${pkg_dir}${install_home_path}/examples
 cp -r ${top_dir}/src/connector/grafana              ${pkg_dir}${install_home_path}/connector
 cp -r ${top_dir}/src/connector/python               ${pkg_dir}${install_home_path}/connector

packaging/release.sh

@@ -3,7 +3,9 @@
 # Generate the deb package for ubunt, or rpm package for centos, or tar.gz package for other linux os
 
 set -e
-#set -x
+# set -x
+
+armver=$1
 
 curr_dir=$(pwd)
 script_dir="$(dirname $(readlink -f $0))"
@@ -110,21 +112,28 @@ echo "char gitinfo[128] = \"$(git rev-parse --verify HEAD)\";"  >> ${versioninfo
 echo "char buildinfo[512] = \"Built by ${USER} at ${build_time}\";"  >> ${versioninfo}
 
 # 2. cmake executable file
-#default use debug mode
-compile_mode="debug"
-if [[ $1 == "Release" ]] || [[ $1 == "release" ]]; then
-  compile_mode="Release"
-fi
 
-compile_dir="${top_dir}/${compile_mode}"
+compile_dir="${top_dir}/debug"
 if [ -d ${compile_dir} ]; then
-	 ${csudo} rm -rf ${compile_dir}
+    ${csudo} rm -rf ${compile_dir}
 fi
 
 ${csudo} mkdir -p ${compile_dir}
 cd ${compile_dir}
-${csudo} cmake -DCMAKE_BUILD_TYPE=${compile_mode} ${top_dir}
+
-${csudo} make
+# arm only support lite ver
+if [ -z "$armver" ]; then
+  cmake ../
+elif [ "$armver" == "arm64" ]; then
+  cmake ../ -DARMVER=arm64
+elif [ "$armver" == "arm32" ]; then
+  cmake ../ -DARMVER=arm32
+else
+  echo "input parameter error!!!"
+  return
+fi
+
+make
 
 cd ${curr_dir}
 
@@ -153,7 +162,8 @@ ${csudo} ./makerpm.sh ${compile_dir} ${output_dir} ${version}
 
 echo "do tar.gz package for all systems"  
 cd ${script_dir}/tools
-${csudo} ./makepkg.sh ${compile_dir} ${version} "${build_time}" 
+${csudo} ./makepkg.sh    ${compile_dir} ${version} "${build_time}" ${armver}
+${csudo} ./makeclient.sh ${compile_dir} ${version} "${build_time}" ${armver}
 
 # 4. Clean up temporary compile directories
 #${csudo} rm -rf ${compile_dir}

packaging/rpm/tdengine.spec

@@ -39,8 +39,7 @@ echo topdir: %{_topdir}
 echo version: %{_version}
 echo buildroot: %{buildroot}
 
-versioninfo=$(%{_compiledir}/../packaging/tools/get_version.sh)
+libfile="libtaos.so.%{_version}"
-libfile="libtaos.so.${versioninfo}"
 
 # create install path, and cp file
 mkdir -p %{buildroot}%{homepath}/bin
@@ -62,6 +61,7 @@ cp %{_compiledir}/build/bin/taosdemo                %{buildroot}%{homepath}/bin
 cp %{_compiledir}/build/bin/taosdump                %{buildroot}%{homepath}/bin
 cp %{_compiledir}/build/lib/${libfile}              %{buildroot}%{homepath}/driver
 cp %{_compiledir}/../src/inc/taos.h                 %{buildroot}%{homepath}/include
+cp %{_compiledir}/../src/inc/taoserror.h            %{buildroot}%{homepath}/include
 cp -r %{_compiledir}/../src/connector/grafana       %{buildroot}%{homepath}/connector
 cp -r %{_compiledir}/../src/connector/python        %{buildroot}%{homepath}/connector
 cp -r %{_compiledir}/../src/connector/go            %{buildroot}%{homepath}/connector
@@ -79,18 +79,17 @@ fi
 if pidof taosd &> /dev/null; then
     if pidof systemd &> /dev/null; then
         ${csudo} systemctl stop taosd || :
-    elif $(which insserv &> /dev/null); then
+    elif $(which service  &> /dev/null); then
-        ${csudo} service taosd stop || :
-    elif $(which update-rc.d &> /dev/null); then
         ${csudo} service taosd stop || :
     else
         pid=$(ps -ef | grep "taosd" | grep -v "grep" | awk '{print $2}')
-        ${csudo} kill -9 ${pid}   || :
+        if [ -n "$pid" ]; then
+           ${csudo} kill -9 $pid   || :
+        fi
     fi
     echo "Stop taosd service success!"
     sleep 1
 fi
-
 # if taos.cfg already softlink, remove it
 if [ -f %{cfg_install_dir}/taos.cfg ]; then
     ${csudo} rm -f %{homepath}/cfg/taos.cfg   || :
@@ -138,13 +137,16 @@ if [ $1 -eq 0 ];then
     ${csudo} rm -f ${bin_link_dir}/taosdump   || :
     ${csudo} rm -f ${cfg_link_dir}/*          || :
     ${csudo} rm -f ${inc_link_dir}/taos.h     || :
+    ${csudo} rm -f ${inc_link_dir}/taoserror.h     || :
     ${csudo} rm -f ${lib_link_dir}/libtaos.*  || :
     
     ${csudo} rm -f ${log_link_dir}            || :
     ${csudo} rm -f ${data_link_dir}           || :
     
     pid=$(ps -ef | grep "taosd" | grep -v "grep" | awk '{print $2}')
-    ${csudo} kill -9 ${pid}   || :      
+    if [ -n "$pid" ]; then
+      ${csudo} kill -9 $pid   || :
+    fi    
   fi  
 fi
  

packaging/tools/get_version.sh

@@ -7,8 +7,7 @@ set -e
 # set -x
 
 # -----------------------Variables definition---------------------
-script_dir=$(dirname $(readlink -m "$0"))
+verinfo=$(cat $1 | grep " version" | cut -d '"' -f2)
-verinfo=$(cat ${script_dir}/../../src/util/src/version.c | grep " version" | cut -d '"' -f2)
 verinfo=$(echo $verinfo | tr "\n" " ")
 len=$(echo ${#verinfo})
 len=$((len-1))

packaging/tools/install.sh

@@ -1,6 +1,6 @@
 #!/bin/bash
 #
-# This file is used to install TAOS time-series database on linux systems. The operating system 
+# This file is used to install database on linux systems. The operating system
 # is required to use systemd to manage services at boot
 
 set -e
@@ -41,19 +41,58 @@ if command -v sudo > /dev/null; then
     csudo="sudo"
 fi
 
+initd_mod=0
 service_mod=2
 if pidof systemd &> /dev/null; then
     service_mod=0
-elif $(which update-rc.d &> /dev/null); then
+elif $(which service &> /dev/null); then    
     service_mod=1
-    service_config_dir="/etc/init.d"
+    service_config_dir="/etc/init.d" 
+    if $(which chkconfig &> /dev/null); then
+         initd_mod=1 
+    elif $(which insserv &> /dev/null); then
+        initd_mod=2
+    elif $(which update-rc.d &> /dev/null); then
+        initd_mod=3
+    else
+        service_mod=2
+    fi
 else 
     service_mod=2
 fi
 
+
+# get the operating system type for using the corresponding init file
+# ubuntu/debian(deb), centos/fedora(rpm), others: opensuse, redhat, ..., no verification
+#osinfo=$(awk -F= '/^NAME/{print $2}' /etc/os-release)
+osinfo=$(cat /etc/os-release | grep "NAME" | cut -d '"' -f2)
+#echo "osinfo: ${osinfo}"
+os_type=0
+if echo $osinfo | grep -qwi "ubuntu" ; then
+  echo "this is ubuntu system"
+  os_type=1
+elif echo $osinfo | grep -qwi "debian" ; then
+  echo "this is debian system"
+  os_type=1
+elif echo $osinfo | grep -qwi "Kylin" ; then
+  echo "this is Kylin system"
+  os_type=1
+elif  echo $osinfo | grep -qwi "centos" ; then
+  echo "this is centos system"
+  os_type=2
+elif echo $osinfo | grep -qwi "fedora" ; then
+  echo "this is fedora system"
+  os_type=2
+else
+  echo "this is other linux system"
+  os_type=0
+fi
+
 function kill_taosd() {
   pid=$(ps -ef | grep "taosd" | grep -v "grep" | awk '{print $2}')
-  ${csudo} kill -9 pid   || :
+  if [ -n "$pid" ]; then
+    ${csudo} kill -9 $pid   || :
+  fi
 }
 
 function install_main_path() {
@@ -81,7 +120,7 @@ function install_bin() {
 
     #Make link
     [ -x ${install_main_dir}/bin/taos ] && ${csudo} ln -s ${install_main_dir}/bin/taos ${bin_link_dir}/taos             || :
-    [ -x ${install_main_dir}/bin/taosd ] && ${csudo} ln -s ${install_main_dir}/bin/taosd ${bin_link_dir}/taosd          || :   
+    [ -x ${install_main_dir}/bin/taosd ] && ${csudo} ln -s ${install_main_dir}/bin/taosd ${bin_link_dir}/taosd          || :
     [ -x ${install_main_dir}/bin/taosdump ] && ${csudo} ln -s ${install_main_dir}/bin/taosdump ${bin_link_dir}/taosdump || :
     [ -x ${install_main_dir}/bin/taosdemo ] && ${csudo} ln -s ${install_main_dir}/bin/taosdemo ${bin_link_dir}/taosdemo || :
     [ -x ${install_main_dir}/bin/remove.sh ] && ${csudo} ln -s ${install_main_dir}/bin/remove.sh ${bin_link_dir}/rmtaos || :
@@ -89,7 +128,7 @@ function install_bin() {
 
 function install_lib() {
     # Remove links
-    ${csudo} rm -f ${lib_link_dir}/libtaos.*     || :    
+    ${csudo} rm -f ${lib_link_dir}/libtaos.*         || :
 
     ${csudo} cp -rf ${script_dir}/driver/* ${install_main_dir}/driver && ${csudo} chmod 777 ${install_main_dir}/driver/*  
     
@@ -98,24 +137,26 @@ function install_lib() {
 }
 
 function install_header() {
-    ${csudo} rm -f ${inc_link_dir}/taos.h     || :    
+    ${csudo} rm -f ${inc_link_dir}/taos.h ${inc_link_dir}/taoserror.h    || :
     ${csudo} cp -f ${script_dir}/inc/* ${install_main_dir}/include && ${csudo} chmod 644 ${install_main_dir}/include/*    
     ${csudo} ln -s ${install_main_dir}/include/taos.h ${inc_link_dir}/taos.h
+    ${csudo} ln -s ${install_main_dir}/include/taoserror.h ${inc_link_dir}/taoserror.h
 }
 
 function install_config() {
     #${csudo} rm -f ${install_main_dir}/cfg/taos.cfg     || :
     
-    if [ ! -f ${cfg_install_dir}/taos.cfg ]; then  
+    if [ ! -f ${cfg_install_dir}/taos.cfg ]; then
         ${csudo} mkdir -p ${cfg_install_dir}
         [ -f ${script_dir}/cfg/taos.cfg ] && ${csudo} cp ${script_dir}/cfg/taos.cfg ${cfg_install_dir}
         ${csudo} chmod 644 ${cfg_install_dir}/*
     fi 
     
     ${csudo} cp -f ${script_dir}/cfg/taos.cfg ${install_main_dir}/cfg/taos.cfg.org
-    ${csudo} ln -s ${cfg_install_dir}/taos.cfg ${install_main_dir}/cfg   
+    ${csudo} ln -s ${cfg_install_dir}/taos.cfg ${install_main_dir}/cfg
 }
 
+
 function install_log() {
     ${csudo} rm -rf ${log_dir}  || :
     ${csudo} mkdir -p ${log_dir} && ${csudo} chmod 777 ${log_dir}
@@ -138,14 +179,26 @@ function install_examples() {
 }
 
 function clean_service_on_sysvinit() {
-    restart_config_str="taos:2345:respawn:${service_config_dir}/taosd start"
+    #restart_config_str="taos:2345:respawn:${service_config_dir}/taosd start"
+    #${csudo} sed -i "\|${restart_config_str}|d" /etc/inittab || :    
+    
     if pidof taosd &> /dev/null; then
         ${csudo} service taosd stop || :
     fi
-    ${csudo} sed -i "\|${restart_config_str}|d" /etc/inittab || :
+
+    if ((${initd_mod}==1)); then
+        ${csudo} chkconfig --del taosd || :
+    elif ((${initd_mod}==2)); then
+        ${csudo} insserv -r taosd || :
+    elif ((${initd_mod}==3)); then
+        ${csudo} update-rc.d -f taosd remove || :
+    fi
+    
     ${csudo} rm -f ${service_config_dir}/taosd || :
-    ${csudo} update-rc.d -f taosd remove || :
+    
-    ${csudo} init q || :
+    if $(which init &> /dev/null); then
+        ${csudo} init q || :
+    fi
 }
 
 function install_service_on_sysvinit() {
@@ -154,14 +207,27 @@ function install_service_on_sysvinit() {
     sleep 1
 
     # Install taosd service
-    ${csudo} cp -f ${script_dir}/init.d/taosd ${install_main_dir}/init.d
-    ${csudo} cp ${script_dir}/init.d/taosd ${service_config_dir} && ${csudo} chmod a+x ${service_config_dir}/taosd
-    restart_config_str="taos:2345:respawn:${service_config_dir}/taosd start"
 
-    ${csudo} grep -q -F "$restart_config_str" /etc/inittab || ${csudo} bash -c "echo '${restart_config_str}' >> /etc/inittab"
+    if ((${os_type}==1)); then
-    # TODO: for centos, change here
+        ${csudo} cp -f ${script_dir}/init.d/taosd.deb ${install_main_dir}/init.d/taosd
-    ${csudo} update-rc.d taosd defaults
+        ${csudo} cp    ${script_dir}/init.d/taosd.deb ${service_config_dir}/taosd && ${csudo} chmod a+x ${service_config_dir}/taosd
-    # chkconfig mysqld on
+    elif ((${os_type}==2)); then
+        ${csudo} cp -f ${script_dir}/init.d/taosd.rpm ${install_main_dir}/init.d/taosd
+        ${csudo} cp    ${script_dir}/init.d/taosd.rpm ${service_config_dir}/taosd && ${csudo} chmod a+x ${service_config_dir}/taosd
+    fi
+    
+    #restart_config_str="taos:2345:respawn:${service_config_dir}/taosd start"
+    #${csudo} grep -q -F "$restart_config_str" /etc/inittab || ${csudo} bash -c "echo '${restart_config_str}' >> /etc/inittab"
+    
+    if ((${initd_mod}==1)); then
+        ${csudo} chkconfig --add taosd || :
+        ${csudo} chkconfig --level 2345 taosd on || :
+    elif ((${initd_mod}==2)); then
+        ${csudo} insserv taosd || :
+        ${csudo} insserv -d taosd || :
+    elif ((${initd_mod}==3)); then
+        ${csudo} update-rc.d taosd defaults || :
+    fi
 }
 
 function clean_service_on_systemd() {
@@ -211,7 +277,7 @@ function install_service() {
     elif ((${service_mod}==1)); then
         install_service_on_sysvinit
     else
-        # must manual start taosd
+        # must manual stop taosd
         kill_taosd
     fi
 }
@@ -247,9 +313,9 @@ vercomp () {
 
 function is_version_compatible() {
 
-    curr_version=$(${bin_dir}/taosd -V | cut -d ' ' -f 1)
+    curr_version=$(${bin_dir}/taosd -V | head -1 | cut -d ' ' -f 2)
 
-    min_compatible_version=$(${script_dir}/bin/taosd -V | cut -d ' ' -f 2)
+    min_compatible_version=$(${script_dir}/bin/taosd -V | head -1 | cut -d ' ' -f 4)
 
     vercomp $curr_version $min_compatible_version
     case $? in
@@ -265,7 +331,7 @@ function update_TDengine() {
         echo "File taos.tar.gz does not exist"
         exit 1
     fi
-    tar -zxf taos.tar.gz 
+    tar -zxf taos.tar.gz
 
     # Check if version compatible
     if ! is_version_compatible; then
@@ -273,7 +339,7 @@ function update_TDengine() {
         return 1
     fi
 
-    echo -e "${GREEN}Start to update TDEngine...${NC}"
+    echo -e "${GREEN}Start to update TDengine...${NC}"
     # Stop the service if running
     if pidof taosd &> /dev/null; then
         if ((${service_mod}==0)); then
@@ -305,8 +371,7 @@ function update_TDengine() {
         if ((${service_mod}==0)); then
             echo -e "${GREEN_DARK}To start TDengine     ${NC}: ${csudo} systemctl start taosd${NC}"
         elif ((${service_mod}==1)); then
-            echo -e "${GREEN_DARK}To start TDengine     ${NC}: ${csudo} update-rc.d taosd default  ${RED} for the first time${NC}"
+            echo -e "${GREEN_DARK}To start TDengine     ${NC}: ${csudo} service taosd start${NC}"
-            echo -e "                      : ${csudo} service taosd start ${RED} after${NC}"
         else
             echo -e "${GREEN_DARK}To start TDengine     ${NC}: ./taosd${NC}"
         fi
@@ -315,7 +380,7 @@ function update_TDengine() {
         echo
         echo -e "\033[44;32;1mTDengine is updated successfully!${NC}"
     else
-        install_bin $1
+        install_bin
         install_config
 
         echo
@@ -331,9 +396,9 @@ function install_TDengine() {
         echo "File taos.tar.gz does not exist"
         exit 1
     fi
-    tar -zxf taos.tar.gz 
+    tar -zxf taos.tar.gz
 
-    echo -e "${GREEN}Start to install TDEngine...${NC}"
+    echo -e "${GREEN}Start to install TDengine...${NC}"
     
 	  install_main_path
 	   
@@ -361,10 +426,9 @@ function install_TDengine() {
         if ((${service_mod}==0)); then
             echo -e "${GREEN_DARK}To start TDengine     ${NC}: ${csudo} systemctl start taosd${NC}"
         elif ((${service_mod}==1)); then
-            echo -e "${GREEN_DARK}To start TDengine     ${NC}: ${csudo} update-rc.d taosd default  ${RED} for the first time${NC}"
+            echo -e "${GREEN_DARK}To start TDengine     ${NC}: ${csudo} service taosd start${NC}"
-            echo -e "                      : ${csudo} service taosd start ${RED} after${NC}"
         else
-            echo -e "${GREEN_DARK}To start TDengine     ${NC}: ./taosd${NC}"
+            echo -e "${GREEN_DARK}To start TDengine     ${NC}: taosd${NC}"
         fi
 
         echo -e "${GREEN_DARK}To access TDengine    ${NC}: use ${GREEN_UNDERLINE}taos${NC} in shell${NC}"

packaging/tools/install_client.sh

@@ -1,4 +1,201 @@
 #!/bin/bash
+#
+# This file is used to install TDengine client on linux systems. The operating system
+# is required to use systemd to manage services at boot
 
+set -e
+#set -x
+
+# -----------------------Variables definition---------------------
 script_dir=$(dirname $(readlink -m "$0"))
-${script_dir}/install.sh client
+# Dynamic directory
+data_dir="/var/lib/taos"
+log_dir="/var/log/taos"
+
+log_link_dir="/usr/local/taos/log"
+
+cfg_install_dir="/etc/taos"
+
+bin_link_dir="/usr/bin"
+lib_link_dir="/usr/lib"
+inc_link_dir="/usr/include"
+
+#install main path
+install_main_dir="/usr/local/taos"
+
+# old bin dir
+bin_dir="/usr/local/taos/bin"
+
+
+# Color setting
+RED='\033[0;31m'
+GREEN='\033[1;32m'
+GREEN_DARK='\033[0;32m'
+GREEN_UNDERLINE='\033[4;32m'
+NC='\033[0m'
+
+csudo=""
+if command -v sudo > /dev/null; then
+    csudo="sudo"
+fi
+
+update_flag=0
+
+function kill_client() {
+  pid=$(ps -ef | grep "taos" | grep -v "grep" | awk '{print $2}')
+  if [ -n "$pid" ]; then
+    ${csudo} kill -9 $pid   || :
+  fi
+}
+
+function install_main_path() {
+    #create install main dir and all sub dir
+    ${csudo} rm -rf ${install_main_dir}    || :
+    ${csudo} mkdir -p ${install_main_dir}  
+    ${csudo} mkdir -p ${install_main_dir}/cfg
+    ${csudo} mkdir -p ${install_main_dir}/bin    
+    ${csudo} mkdir -p ${install_main_dir}/connector
+    ${csudo} mkdir -p ${install_main_dir}/driver
+    ${csudo} mkdir -p ${install_main_dir}/examples
+    ${csudo} mkdir -p ${install_main_dir}/include
+}
+
+function install_bin() {
+    # Remove links
+    ${csudo} rm -f ${bin_link_dir}/taos     || :
+    ${csudo} rm -f ${bin_link_dir}/taosdump || :
+    ${csudo} rm -f ${bin_link_dir}/rmtaos   || :
+
+    ${csudo} cp -r ${script_dir}/bin/* ${install_main_dir}/bin && ${csudo} chmod 0555 ${install_main_dir}/bin/*
+
+    #Make link
+    [ -x ${install_main_dir}/bin/taos ] && ${csudo} ln -s ${install_main_dir}/bin/taos ${bin_link_dir}/taos             || :
+    [ -x ${install_main_dir}/bin/taosdump ] && ${csudo} ln -s ${install_main_dir}/bin/taosdump ${bin_link_dir}/taosdump || :
+    [ -x ${install_main_dir}/bin/remove_client.sh ] && ${csudo} ln -s ${install_main_dir}/bin/remove_client.sh ${bin_link_dir}/rmtaos || :
+}
+
+function clean_lib() {
+    sudo rm -f /usr/lib/libtaos.so || :
+    sudo rm -rf ${lib_dir} || :
+}
+
+function install_lib() {
+    # Remove links
+    ${csudo} rm -f ${lib_link_dir}/libtaos.*         || :
+
+    ${csudo} cp -rf ${script_dir}/driver/* ${install_main_dir}/driver && ${csudo} chmod 777 ${install_main_dir}/driver/*  
+    
+    ${csudo} ln -s ${install_main_dir}/driver/libtaos.* ${lib_link_dir}/libtaos.so.1
+    ${csudo} ln -s ${lib_link_dir}/libtaos.so.1 ${lib_link_dir}/libtaos.so
+    
+}
+
+function install_header() {
+    ${csudo} rm -f ${inc_link_dir}/taos.h ${inc_link_dir}/taoserror.h    || :
+    ${csudo} cp -f ${script_dir}/inc/* ${install_main_dir}/include && ${csudo} chmod 644 ${install_main_dir}/include/*    
+    ${csudo} ln -s ${install_main_dir}/include/taos.h ${inc_link_dir}/taos.h
+    ${csudo} ln -s ${install_main_dir}/include/taoserror.h ${inc_link_dir}/taoserror.h
+}
+
+function install_config() {
+    #${csudo} rm -f ${install_main_dir}/cfg/taos.cfg     || :
+    
+    if [ ! -f ${cfg_install_dir}/taos.cfg ]; then
+        ${csudo} mkdir -p ${cfg_install_dir}
+        [ -f ${script_dir}/cfg/taos.cfg ] && ${csudo} cp ${script_dir}/cfg/taos.cfg ${cfg_install_dir}
+        ${csudo} chmod 644 ${cfg_install_dir}/*
+    fi 
+    
+    ${csudo} cp -f ${script_dir}/cfg/taos.cfg ${install_main_dir}/cfg/taos.cfg.org
+    ${csudo} ln -s ${cfg_install_dir}/taos.cfg ${install_main_dir}/cfg
+}
+
+
+function install_log() {
+    ${csudo} rm -rf ${log_dir}  || :
+    ${csudo} mkdir -p ${log_dir} && ${csudo} chmod 777 ${log_dir}
+    
+    ${csudo} ln -s ${log_dir} ${install_main_dir}/log
+}
+
+function install_connector() {
+    ${csudo} cp -rf ${script_dir}/connector/* ${install_main_dir}/connector
+}
+
+function install_examples() {
+    if [ -d ${script_dir}/examples ]; then
+        ${csudo} cp -rf ${script_dir}/examples/* ${install_main_dir}/examples
+    fi
+}
+
+function update_TDengine() {
+    # Start to update
+    if [ ! -e taos.tar.gz ]; then
+        echo "File taos.tar.gz does not exist"
+        exit 1
+    fi
+    tar -zxf taos.tar.gz
+
+    echo -e "${GREEN}Start to update TDengine client...${NC}"
+    # Stop the client shell if running
+    if pidof taos &> /dev/null; then
+        kill_client
+        sleep 1
+    fi
+    
+    install_main_path
+
+    install_log
+    install_header
+    install_lib
+    install_connector
+    install_examples
+    install_bin
+    install_config
+    
+    echo
+    echo -e "\033[44;32;1mTDengine client is updated successfully!${NC}"
+
+    rm -rf $(tar -tf taos.tar.gz)
+}
+
+function install_TDengine() {
+    # Start to install
+    if [ ! -e taos.tar.gz ]; then
+        echo "File taos.tar.gz does not exist"
+        exit 1
+    fi
+    tar -zxf taos.tar.gz
+
+    echo -e "${GREEN}Start to install TDengine client...${NC}"
+    
+	  install_main_path
+    install_log 
+    install_header
+    install_lib
+    install_connector
+    install_examples
+    install_bin
+    install_config
+ 
+    echo
+    echo -e "\033[44;32;1mTDengine client is installed successfully!${NC}"
+
+    rm -rf $(tar -tf taos.tar.gz)
+}
+
+
+## ==============================Main program starts from here============================
+# Install or updata client and client
+# if server is already install, don't install client
+  if [ -e ${bin_dir}/taosd ]; then
+      echo -e "\033[44;32;1mThere are already installed TDengine server, so don't need install client!${NC}"
+      exit 0
+  fi  
+  
+  if [ -x ${bin_dir}/taos ]; then
+      update_flag=1
+      update_TDengine
+  else
+      install_TDengine
+  fi

packaging/tools/make_install.sh

@@ -101,7 +101,7 @@ function install_lib() {
     # Remove links
     ${csudo} rm -f ${lib_link_dir}/libtaos.*     || :    
     
-    versioninfo=$(${script_dir}/get_version.sh)
+    versioninfo=$(${script_dir}/get_version.sh ${source_dir}/src/util/src/version.c)
     ${csudo} cp ${binary_dir}/build/lib/libtaos.so.${versioninfo} ${install_main_dir}/driver && ${csudo} chmod 777 ${install_main_dir}/driver/*
     ${csudo} ln -sf ${install_main_dir}/driver/libtaos.so.${versioninfo} ${lib_link_dir}/libtaos.so.1
     ${csudo} ln -sf ${lib_link_dir}/libtaos.so.1 ${lib_link_dir}/libtaos.so
@@ -109,9 +109,10 @@ function install_lib() {
 
 function install_header() {
 
-    ${csudo} rm -f ${inc_link_dir}/taos.h     || :    
+    ${csudo} rm -f ${inc_link_dir}/taos.h ${inc_link_dir}/taoserror.h    || :    
-    ${csudo} cp -f ${source_dir}/src/inc/taos.h ${install_main_dir}/include && ${csudo} chmod 644 ${install_main_dir}/include/*    
+    ${csudo} cp -f ${source_dir}/src/inc/taos.h ${source_dir}/src/inc/taoserror.h ${install_main_dir}/include && ${csudo} chmod 644 ${install_main_dir}/include/*    
     ${csudo} ln -s ${install_main_dir}/include/taos.h ${inc_link_dir}/taos.h
+    ${csudo} ln -s ${install_main_dir}/include/taoserror.h ${inc_link_dir}/taoserror.h
 }
 
 function install_config() {

packaging/tools/makeclient.sh

@@ -0,0 +1,79 @@
+#!/bin/bash
+#
+# Generate tar.gz package for linux client
+set -e
+set -x
+
+curr_dir=$(pwd)
+compile_dir=$1
+version=$2
+build_time=$3
+armver=$4
+
+script_dir="$(dirname $(readlink -f $0))"
+top_dir="$(readlink -m ${script_dir}/../..)"
+
+# create compressed install file.
+build_dir="${compile_dir}/build"
+code_dir="${top_dir}/src"
+release_dir="${top_dir}/release"
+community_dir="${script_dir}/../../../community/src"
+
+package_name='linux'
+install_dir="${release_dir}/taos-client-${version}-${package_name}-$(echo ${build_time}| tr ': ' -)"
+
+# Directories and files.
+bin_files="${build_dir}/bin/taos ${build_dir}/bin/taosdump ${script_dir}/remove_client.sh"
+lib_files="${build_dir}/lib/libtaos.so.${version}"
+header_files="${community_dir}/inc/taos.h ${community_dir}/inc/taoserror.h"
+cfg_dir="${top_dir}/packaging/cfg"
+install_files="${script_dir}/install_client.sh"
+
+# make directories.
+mkdir -p ${install_dir}
+mkdir -p ${install_dir}/inc && cp ${header_files} ${install_dir}/inc
+mkdir -p ${install_dir}/cfg && cp ${cfg_dir}/taos.cfg ${install_dir}/cfg/taos.cfg
+mkdir -p ${install_dir}/bin && cp ${bin_files} ${install_dir}/bin && chmod a+x ${install_dir}/bin/*
+
+cd ${install_dir}
+tar -zcv -f taos.tar.gz * --remove-files || :
+
+cd ${curr_dir}
+cp ${install_files} ${install_dir} && chmod a+x ${install_dir}/install*
+
+# Copy example code
+mkdir -p ${install_dir}/examples
+cp -r ${top_dir}/tests/examples/c      ${install_dir}/examples
+cp -r ${top_dir}/tests/examples/JDBC   ${install_dir}/examples
+cp -r ${top_dir}/tests/examples/matlab ${install_dir}/examples
+cp -r ${top_dir}/tests/examples/python ${install_dir}/examples
+cp -r ${top_dir}/tests/examples/R      ${install_dir}/examples
+cp -r ${top_dir}/tests/examples/go     ${install_dir}/examples
+
+# Copy driver
+mkdir -p ${install_dir}/driver 
+cp ${lib_files} ${install_dir}/driver
+
+# Copy connector
+connector_dir="${community_dir}/connector"
+mkdir -p ${install_dir}/connector
+cp ${build_dir}/lib/*.jar      ${install_dir}/connector
+cp -r ${connector_dir}/grafana ${install_dir}/connector/
+cp -r ${connector_dir}/python  ${install_dir}/connector/
+cp -r ${connector_dir}/go      ${install_dir}/connector
+
+# Copy release note
+# cp ${script_dir}/release_note ${install_dir}
+
+# exit 1
+
+cd ${release_dir}  
+if [ -z "$armver" ]; then
+  tar -zcv -f "$(basename ${install_dir}).tar.gz" $(basename ${install_dir}) --remove-files
+elif [ "$armver" == "arm64" ]; then
+  tar -zcv -f "$(basename ${install_dir})-arm64.tar.gz" $(basename ${install_dir}) --remove-files
+elif [ "$armver" == "arm32" ]; then
+  tar -zcv -f "$(basename ${install_dir})-arm32.tar.gz" $(basename ${install_dir}) --remove-files
+fi
+
+cd ${curr_dir}

packaging/tools/makepkg.sh

@@ -6,6 +6,7 @@ curr_dir=$(pwd)
 compile_dir=$1
 version=$2
 build_time=$3
+armver=$4
 
 script_dir="$(dirname $(readlink -f $0))"
 top_dir="$(readlink -m ${script_dir}/../..)"
@@ -20,11 +21,10 @@ install_dir="${release_dir}/taos-${version}-${package_name}-$(echo ${build_time}
 
 # Directories and files.
 bin_files="${build_dir}/bin/taosd ${build_dir}/bin/taos ${build_dir}/bin/taosdemo ${build_dir}/bin/taosdump ${script_dir}/remove.sh"
-versioninfo=$(${script_dir}/get_version.sh)
+lib_files="${build_dir}/lib/libtaos.so.${version}"
-lib_files="${build_dir}/lib/libtaos.so.${versioninfo}"
+header_files="${code_dir}/inc/taos.h ${code_dir}/inc/taoserror.h"
-header_files="${code_dir}/inc/taos.h"
+cfg_dir="${top_dir}/packaging/cfg"
-cfg_files="${top_dir}/packaging/cfg/*.cfg"
+install_files="${script_dir}/install.sh"
-install_files="${script_dir}/install.sh ${script_dir}/install_client.sh"
 
 # Init file
 #init_dir=${script_dir}/deb
@@ -33,29 +33,32 @@ install_files="${script_dir}/install.sh ${script_dir}/install_client.sh"
 #fi
 #init_files=${init_dir}/taosd
 # temp use rpm's taosd. TODO: later modify according to os type
-init_files=${script_dir}/../rpm/taosd
+init_file_deb=${script_dir}/../deb/taosd
+init_file_rpm=${script_dir}/../rpm/taosd
 
 # make directories.
 mkdir -p ${install_dir}
 mkdir -p ${install_dir}/inc && cp ${header_files} ${install_dir}/inc
-mkdir -p ${install_dir}/cfg && cp ${cfg_files} ${install_dir}/cfg
+mkdir -p ${install_dir}/cfg && cp ${cfg_dir}/taos.cfg ${install_dir}/cfg/taos.cfg
 mkdir -p ${install_dir}/bin && cp ${bin_files} ${install_dir}/bin && chmod a+x ${install_dir}/bin/*
-mkdir -p ${install_dir}/init.d    && cp ${init_files} ${install_dir}/init.d
+mkdir -p ${install_dir}/init.d && cp ${init_file_deb} ${install_dir}/init.d/taosd.deb
+mkdir -p ${install_dir}/init.d && cp ${init_file_rpm} ${install_dir}/init.d/taosd.rpm
 
 cd ${install_dir}
-tar -zcv -f taos.tar.gz * --remove-files || : 
+tar -zcv -f taos.tar.gz * --remove-files || :
 
 cd ${curr_dir}
 cp ${install_files} ${install_dir} && chmod a+x ${install_dir}/install*
 
 # Copy example code
 mkdir -p ${install_dir}/examples
-cp -r ${top_dir}/tests/examples/c      ${install_dir}/examples
+examples_dir="${top_dir}/tests/examples"
-cp -r ${top_dir}/tests/examples/JDBC   ${install_dir}/examples
+cp -r ${examples_dir}/c      ${install_dir}/examples
-cp -r ${top_dir}/tests/examples/matlab ${install_dir}/examples
+cp -r ${examples_dir}/JDBC   ${install_dir}/examples
-cp -r ${top_dir}/tests/examples/python ${install_dir}/examples
+cp -r ${examples_dir}/matlab ${install_dir}/examples
-cp -r ${top_dir}/tests/examples/R      ${install_dir}/examples
+cp -r ${examples_dir}/python ${install_dir}/examples
-cp -r ${top_dir}/tests/examples/go     ${install_dir}/examples
+cp -r ${examples_dir}/R      ${install_dir}/examples
+cp -r ${examples_dir}/go     ${install_dir}/examples
 
 # Copy driver
 mkdir -p ${install_dir}/driver 
@@ -64,18 +67,23 @@ cp ${lib_files} ${install_dir}/driver
 # Copy connector
 connector_dir="${code_dir}/connector"
 mkdir -p ${install_dir}/connector
+cp ${build_dir}/lib/*.jar      ${install_dir}/connector
 cp -r ${connector_dir}/grafana ${install_dir}/connector/
 cp -r ${connector_dir}/python  ${install_dir}/connector/
 cp -r ${connector_dir}/go      ${install_dir}/connector
-cp ${build_dir}/lib/*.jar      ${install_dir}/connector
-
 
 # Copy release note
-cp ${script_dir}/release_note ${install_dir}
+# cp ${script_dir}/release_note ${install_dir}
 
 # exit 1
 
 cd ${release_dir}  
-tar -zcv -f "$(basename ${install_dir}).tar.gz" $(basename ${install_dir}) --remove-files
+if [ -z "$armver" ]; then
+  tar -zcv -f "$(basename ${install_dir}).tar.gz" $(basename ${install_dir}) --remove-files
+elif [ "$armver" == "arm64" ]; then
+  tar -zcv -f "$(basename ${install_dir})-arm64.tar.gz" $(basename ${install_dir}) --remove-files
+elif [ "$armver" == "arm32" ]; then
+  tar -zcv -f "$(basename ${install_dir})-arm32.tar.gz" $(basename ${install_dir}) --remove-files
+fi
 
 cd ${curr_dir}

packaging/tools/post.sh

@@ -42,14 +42,18 @@ initd_mod=0
 service_mod=2
 if pidof systemd &> /dev/null; then
     service_mod=0
-elif $(which insserv &> /dev/null); then
+elif $(which service &> /dev/null); then    
     service_mod=1
-    initd_mod=1
+    service_config_dir="/etc/init.d" 
-    service_config_dir="/etc/init.d"
+    if $(which chkconfig &> /dev/null); then
-elif $(which update-rc.d &> /dev/null); then
+         initd_mod=1 
-    service_mod=1
+    elif $(which insserv &> /dev/null); then
-    initd_mod=2
+        initd_mod=2
-    service_config_dir="/etc/init.d"
+    elif $(which update-rc.d &> /dev/null); then
+        initd_mod=3
+    else
+        service_mod=2
+    fi
 else 
     service_mod=2
 fi
@@ -57,12 +61,15 @@ fi
 function kill_taosd() {
 #  ${csudo} pkill -f taosd || :
   pid=$(ps -ef | grep "taosd" | grep -v "grep" | awk '{print $2}')
-  ${csudo} kill -9 ${pid}   || :
+  if [ -n "$pid" ]; then
+    ${csudo} kill -9 $pid   || :
+  fi
 }
 
 function install_include() {
-    ${csudo} rm -f ${inc_link_dir}/taos.h || :
+    ${csudo} rm -f ${inc_link_dir}/taos.h ${inc_link_dir}/taoserror.h|| :
     ${csudo} ln -s ${inc_dir}/taos.h ${inc_link_dir}/taos.h  
+    ${csudo} ln -s ${inc_dir}/taoserror.h ${inc_link_dir}/taoserror.h  
 }
 
 function install_lib() {
@@ -102,20 +109,26 @@ function install_config() {
 }
 
 function clean_service_on_sysvinit() {
-    restart_config_str="taos:2345:respawn:${service_config_dir}/taosd start"
+    #restart_config_str="taos:2345:respawn:${service_config_dir}/taosd start"
+    #${csudo} sed -i "\|${restart_config_str}|d" /etc/inittab || :    
+    
     if pidof taosd &> /dev/null; then
         ${csudo} service taosd stop || :
     fi
-    ${csudo} sed -i "\|${restart_config_str}|d" /etc/inittab || :
+    
-    ${csudo} rm -f ${service_config_dir}/taosd || :
-
     if ((${initd_mod}==1)); then
-        ${csudo} grep -q -F "taos" /etc/inittab && ${csudo} insserv -r taosd || :
+        ${csudo} chkconfig --del taosd || :
     elif ((${initd_mod}==2)); then
-        ${csudo} grep -q -F "taos" /etc/inittab && ${csudo} update-rc.d -f taosd remove || :
+        ${csudo} insserv -r taosd || :
+    elif ((${initd_mod}==3)); then
+        ${csudo} update-rc.d -f taosd remove || :
+    fi
+    
+    ${csudo} rm -f ${service_config_dir}/taosd || :
+    
+    if $(which init &> /dev/null); then
+        ${csudo} init q || :
     fi
-#    ${csudo} update-rc.d -f taosd remove || :
-    ${csudo} init q || :
 }
 
 function install_service_on_sysvinit() {
@@ -126,18 +139,24 @@ function install_service_on_sysvinit() {
     # Install taosd service  
     ${csudo} cp %{init_d_dir}/taosd ${service_config_dir} && ${csudo} chmod a+x ${service_config_dir}/taosd
 
-    restart_config_str="taos:2345:respawn:${service_config_dir}/taosd start"
+    #restart_config_str="taos:2345:respawn:${service_config_dir}/taosd start"
-
+    #${csudo} grep -q -F "$restart_config_str" /etc/inittab || ${csudo} bash -c "echo '${restart_config_str}' >> /etc/inittab"
-    ${csudo} grep -q -F "$restart_config_str" /etc/inittab || ${csudo} bash -c "echo '${restart_config_str}' >> /etc/inittab"
+    
-    # TODO: for centos, change here
+    if ((${initd_mod}==1)); then
-    ${csudo} update-rc.d taosd defaults
+        ${csudo} chkconfig --add taosd || :
-    # chkconfig mysqld on
+        ${csudo} chkconfig --level 2345 taosd on || :
+    elif ((${initd_mod}==2)); then
+        ${csudo} insserv taosd || :
+        ${csudo} insserv -d taosd || :
+    elif ((${initd_mod}==3)); then
+        ${csudo} update-rc.d taosd defaults || :
+    fi
 }
 
 function clean_service_on_systemd() {
     taosd_service_config="${service_config_dir}/taosd.service"
 
-    # taosd service already is stoped before install 
+    # taosd service already is stoped before install in preinst script
     #if systemctl is-active --quiet taosd; then
     #    echo "TDengine is running, stopping it..."
     #    ${csudo} systemctl stop taosd &> /dev/null || echo &> /dev/null

packaging/tools/preun.sh

@@ -26,22 +26,27 @@ initd_mod=0
 service_mod=2
 if pidof systemd &> /dev/null; then
     service_mod=0
-elif $(which insserv &> /dev/null); then
+elif $(which service &> /dev/null); then    
     service_mod=1
-    initd_mod=1
+    service_config_dir="/etc/init.d" 
-    service_config_dir="/etc/init.d"
+    if $(which chkconfig &> /dev/null); then
-elif $(which update-rc.d &> /dev/null); then
+         initd_mod=1 
-    service_mod=1
+    elif $(which insserv &> /dev/null); then
-    initd_mod=2
+        initd_mod=2
-    service_config_dir="/etc/init.d"
+    elif $(which update-rc.d &> /dev/null); then
+        initd_mod=3
+    else
+        service_mod=2
+    fi
 else 
     service_mod=2
 fi
 
-
 function kill_taosd() {
   pid=$(ps -ef | grep "taosd" | grep -v "grep" | awk '{print $2}')
-  ${csudo} kill -9 ${pid}   || :
+  if [ -n "$pid" ]; then
+    ${csudo} kill -9 $pid   || :
+  fi
 }
 
 function clean_service_on_systemd() {
@@ -57,20 +62,27 @@ function clean_service_on_systemd() {
 }
 
 function clean_service_on_sysvinit() {
-    restart_config_str="taos:2345:respawn:${service_config_dir}/taosd start"
+    #restart_config_str="taos:2345:respawn:${service_config_dir}/taosd start"
+    #${csudo} sed -i "\|${restart_config_str}|d" /etc/inittab || :    
+    
     if pidof taosd &> /dev/null; then
+        echo "TDengine taosd is running, stopping it..."
         ${csudo} service taosd stop || :
     fi
-    ${csudo} sed -i "\|${restart_config_str}|d" /etc/inittab || :
-    ${csudo} rm -f ${service_config_dir}/taosd || :
 
     if ((${initd_mod}==1)); then
-        ${csudo} grep -q -F "taos" /etc/inittab && ${csudo} insserv -r taosd || :
+        ${csudo} chkconfig --del taosd || :
     elif ((${initd_mod}==2)); then
-        ${csudo} grep -q -F "taos" /etc/inittab && ${csudo} update-rc.d -f taosd remove || :
+        ${csudo} insserv -r taosd || :
+    elif ((${initd_mod}==3)); then
+        ${csudo} update-rc.d -f taosd remove || :
+    fi
+    
+    ${csudo} rm -f ${service_config_dir}/taosd || :
+   
+    if $(which init &> /dev/null); then
+        ${csudo} init q || :
     fi
-#    ${csudo} update-rc.d -f taosd remove || :
-    ${csudo} init q || :
 }
 
 function clean_service() {
@@ -79,7 +91,7 @@ function clean_service() {
     elif ((${service_mod}==1)); then
         clean_service_on_sysvinit
     else
-        # must manual start taosd
+        # must manual stop taosd
         kill_taosd
     fi
 }
@@ -94,6 +106,7 @@ ${csudo} rm -f ${bin_link_dir}/taosdemo   || :
 ${csudo} rm -f ${bin_link_dir}/taosdump   || :
 ${csudo} rm -f ${cfg_link_dir}/*          || :
 ${csudo} rm -f ${inc_link_dir}/taos.h     || :
+${csudo} rm -f ${inc_link_dir}/taoserror.h     || :
 ${csudo} rm -f ${lib_link_dir}/libtaos.*  || :
 
 ${csudo} rm -f ${log_link_dir}            || :

packaging/tools/release_note

@@ -1,3 +1,14 @@
+taos-1.6.4.0 (Release on 2019-12-01)
+Bug fixed:
+    1.Look for possible causes of file corruption and fix them
+    2.Encapsulate memory allocation functions to reduce the possibility of crashes
+    3.Increase Arm64 compilation options
+    4.Remove most of the warnings in the code
+    5.Provide a variety of connector usage documents
+    6.Network connection can be selected in udp and tcp
+    7.Allow the maximum number of Tags to be 32
+    8.Bugs reported by the user
+
 taos-1.5.2.6 (Release on 2019-05-13)
 Bug fixed:
     - Nchar strings sometimes were wrongly truncated on Window

packaging/tools/remove.sh

@@ -1,6 +1,6 @@
 #!/bin/bash
 #
-# Script to stop the service and uninstall tdengine, but retain the config, data and log files.
+# Script to stop the service and uninstall TDengine, but retain the config, data and log files.
 
 RED='\033[0;31m'
 GREEN='\033[1;32m'
@@ -27,21 +27,27 @@ initd_mod=0
 service_mod=2
 if pidof systemd &> /dev/null; then
     service_mod=0
-elif $(which insserv &> /dev/null); then
+elif $(which service &> /dev/null); then    
     service_mod=1
-    initd_mod=1
+    service_config_dir="/etc/init.d" 
-    service_config_dir="/etc/init.d"
+    if $(which chkconfig &> /dev/null); then
-elif $(which update-rc.d &> /dev/null); then
+         initd_mod=1 
-    service_mod=1
+    elif $(which insserv &> /dev/null); then
-    initd_mod=2
+        initd_mod=2
-    service_config_dir="/etc/init.d"
+    elif $(which update-rc.d &> /dev/null); then
+        initd_mod=3
+    else
+        service_mod=2
+    fi
 else 
     service_mod=2
 fi
 
 function kill_taosd() {
   pid=$(ps -ef | grep "taosd" | grep -v "grep" | awk '{print $2}')
-  ${csudo} kill -9 ${pid}   || :
+  if [ -n "$pid" ]; then
+    ${csudo} kill -9 $pid   || :
+  fi
 }
 
 function clean_bin() {
@@ -61,6 +67,7 @@ function clean_lib() {
 function clean_header() {
     # Remove link
     ${csudo} rm -f ${inc_link_dir}/taos.h       || :
+    ${csudo} rm -f ${inc_link_dir}/taoserror.h       || :
 }
 
 function clean_config() {
@@ -86,20 +93,27 @@ function clean_service_on_systemd() {
 }
 
 function clean_service_on_sysvinit() {
-    restart_config_str="taos:2345:respawn:${service_config_dir}/taosd start"
+    #restart_config_str="taos:2345:respawn:${service_config_dir}/taosd start"
+    #${csudo} sed -i "\|${restart_config_str}|d" /etc/inittab || :    
+    
     if pidof taosd &> /dev/null; then
+        echo "TDengine taosd is running, stopping it..."
         ${csudo} service taosd stop || :
     fi
-    ${csudo} sed -i "\|${restart_config_str}|d" /etc/inittab || :
-    ${csudo} rm -f ${service_config_dir}/taosd || :
 
     if ((${initd_mod}==1)); then
-        ${csudo} grep -q -F "taos" /etc/inittab && ${csudo} insserv -r taosd || :
+        ${csudo} chkconfig --del taosd || :
     elif ((${initd_mod}==2)); then
-        ${csudo} grep -q -F "taos" /etc/inittab && ${csudo} update-rc.d -f taosd remove || :
+        ${csudo} insserv -r taosd || :
+    elif ((${initd_mod}==3)); then
+        ${csudo} update-rc.d -f taosd remove || :
+    fi
+    
+    ${csudo} rm -f ${service_config_dir}/taosd || :
+   
+    if $(which init &> /dev/null); then
+        ${csudo} init q || :
     fi
-#    ${csudo} update-rc.d -f taosd remove || :
-    ${csudo} init q || :
 }
 
 function clean_service() {
@@ -108,7 +122,7 @@ function clean_service() {
     elif ((${service_mod}==1)); then
         clean_service_on_sysvinit
     else
-        # must manual start taosd
+        # must manual stop taosd
         kill_taosd
     fi
 }
@@ -139,4 +153,4 @@ elif  echo $osinfo | grep -qwi "centos" ; then
   ${csudo} rpm -e --noscripts tdengine || :
 fi
 
-echo -e "${GREEN}TDEngine is removed successfully!${NC}"
+echo -e "${GREEN}TDengine is removed successfully!${NC}"

packaging/tools/remove_client.sh

@@ -0,0 +1,75 @@
+#!/bin/bash
+#
+# Script to stop the client and uninstall database, but retain the config and log files.
+set -e
+# set -x
+
+RED='\033[0;31m'
+GREEN='\033[1;32m'
+NC='\033[0m'
+
+#install main path
+install_main_dir="/usr/local/taos"
+
+log_link_dir="/usr/local/taos/log"
+cfg_link_dir="/usr/local/taos/cfg"
+bin_link_dir="/usr/bin"
+lib_link_dir="/usr/lib"
+inc_link_dir="/usr/include"
+
+csudo=""
+if command -v sudo > /dev/null; then
+    csudo="sudo"
+fi
+
+function kill_client() {
+  #pid=$(ps -ef | grep "taos" | grep -v "grep" | awk '{print $2}')
+  if [ -n "$(pidof taos)" ]; then
+    ${csudo} kill -9 $pid   || :
+  fi
+}
+
+function clean_bin() {
+    # Remove link
+    ${csudo} rm -f ${bin_link_dir}/taos      || :
+    ${csudo} rm -f ${bin_link_dir}/taosump  || :
+    ${csudo} rm -f ${bin_link_dir}/rmtaos    || :
+}
+
+function clean_lib() {
+    # Remove link
+    ${csudo} rm -f ${lib_link_dir}/libtaos.*      || :
+}
+
+function clean_header() {
+    # Remove link
+    ${csudo} rm -f ${inc_link_dir}/taos.h       || :
+    ${csudo} rm -f ${inc_link_dir}/taoserror.h       || :
+}
+
+function clean_config() {
+    # Remove link
+    ${csudo} rm -f ${cfg_link_dir}/*            || :    
+}
+
+function clean_log() {
+    # Remove link
+    ${csudo} rm -rf ${log_link_dir}    || :
+}
+
+# Stop client.
+kill_client
+# Remove binary file and links
+clean_bin
+# Remove header file.
+clean_header
+# Remove lib file
+clean_lib
+# Remove link log directory
+clean_log
+# Remove link configuration file
+clean_config
+
+${csudo} rm -rf ${install_main_dir}
+
+echo -e "${GREEN}TDengine client is removed successfully!${NC}"

src/CMakeLists.txt

@@ -1,9 +1,6 @@
 CMAKE_MINIMUM_REQUIRED(VERSION 2.8)
-
 PROJECT(TDengine)
 
-SET(PRJ_HEADER_PATH ${CMAKE_CURRENT_SOURCE_DIR}/inc)
-
 ADD_SUBDIRECTORY(os)
 ADD_SUBDIRECTORY(util)
 ADD_SUBDIRECTORY(rpc)

src/client/CMakeLists.txt

@@ -1,13 +1,14 @@
 CMAKE_MINIMUM_REQUIRED(VERSION 2.8)
-
 PROJECT(TDengine)
 
+INCLUDE_DIRECTORIES(inc)
+INCLUDE_DIRECTORIES(jni)
+INCLUDE_DIRECTORIES(${TD_COMMUNITY_DIR}/src/inc)
+INCLUDE_DIRECTORIES(${TD_OS_DIR}/inc)
 AUX_SOURCE_DIRECTORY(./src SRC)
-INCLUDE_DIRECTORIES(inc jni ${TD_ROOT_DIR}/src/inc ${TD_OS_DIR}/inc)
 
-IF (TD_LINUX)
+IF ((TD_LINUX_64) OR (TD_LINUX_32 AND TD_ARM))
-
+  INCLUDE_DIRECTORIES(${TD_COMMUNITY_DIR}/deps/jni/linux)
-  INCLUDE_DIRECTORIES(${TD_ROOT_DIR}/deps/jni/linux)
 
   # set the static lib name
   ADD_LIBRARY(taos_static STATIC ${SRC})
@@ -23,30 +24,38 @@ IF (TD_LINUX)
   #set version of .so
   #VERSION    so version
   #SOVERSION  api version
-  execute_process(COMMAND chmod 777 ${PROJECT_SOURCE_DIR}/../../packaging/tools/get_version.sh)
+  IF (TD_LITE)
-  execute_process(COMMAND ${PROJECT_SOURCE_DIR}/../../packaging/tools/get_version.sh
+    execute_process(COMMAND chmod 777 ${TD_COMMUNITY_DIR}/packaging/tools/get_version.sh)
-    OUTPUT_VARIABLE
+    execute_process(COMMAND ${TD_COMMUNITY_DIR}/packaging/tools/get_version.sh ${TD_COMMUNITY_DIR}/src/util/src/version.c
-    VERSION_INFO)
+          OUTPUT_VARIABLE
+          VERSION_INFO)
+    MESSAGE(STATUS "build lite version ${VERSION_INFO}")
+  ELSE ()
+    execute_process(COMMAND chmod 777 ${TD_COMMUNITY_DIR}/packaging/tools/get_version.sh)
+    execute_process(COMMAND ${TD_COMMUNITY_DIR}/packaging/tools/get_version.sh ${TD_COMMUNITY_DIR}/src/util/src/version.c
+            OUTPUT_VARIABLE
+            VERSION_INFO)
+    MESSAGE(STATUS "build cluster version ${VERSION_INFO}")
+  ENDIF ()
+
   MESSAGE(STATUS "build version ${VERSION_INFO}")
   SET_TARGET_PROPERTIES(taos PROPERTIES VERSION ${VERSION_INFO} SOVERSION 1)
   
-ELSEIF (TD_WINDOWS)
+ELSEIF (TD_WINDOWS_64)
-  
+  INCLUDE_DIRECTORIES(${TD_COMMUNITY_DIR}/deps/jni/windows)
-  INCLUDE_DIRECTORIES(${TD_ROOT_DIR}/deps/jni/windows)
+  INCLUDE_DIRECTORIES(${TD_COMMUNITY_DIR}/deps/jni/windows/win32)
-  INCLUDE_DIRECTORIES(${TD_ROOT_DIR}/deps/jni/windows/win32)
+  INCLUDE_DIRECTORIES(${TD_COMMUNITY_DIR}/deps/pthread)
-  INCLUDE_DIRECTORIES(${TD_ROOT_DIR}/deps/pthread)  
   
   ADD_LIBRARY(taos_static STATIC ${SRC})
   TARGET_LINK_LIBRARIES(taos_static trpc tutil)
 
   # generate dynamic library (*.dll)
   ADD_LIBRARY(taos SHARED ${SRC})
-  SET_TARGET_PROPERTIES(taos PROPERTIES LINK_FLAGS /DEF:${TD_ROOT_DIR}/src/client/src/taos.def)
+  SET_TARGET_PROPERTIES(taos PROPERTIES LINK_FLAGS /DEF:${TD_COMMUNITY_DIR}/src/client/src/taos.def)
   TARGET_LINK_LIBRARIES(taos trpc)
 
-ELSEIF (TD_DARWIN)
+ELSEIF (TD_DARWIN_64)
-
+  INCLUDE_DIRECTORIES(${TD_COMMUNITY_DIR}/deps/jni/linux)
-  INCLUDE_DIRECTORIES(${TD_ROOT_DIR}/deps/jni/linux)
 
   ADD_LIBRARY(taos_static STATIC ${SRC})
   TARGET_LINK_LIBRARIES(taos_static trpc tutil pthread m)
@@ -55,6 +64,6 @@ ELSEIF (TD_DARWIN)
   # generate dynamic library (*.dylib)
   ADD_LIBRARY(taos SHARED ${SRC})
   TARGET_LINK_LIBRARIES(taos trpc tutil pthread m)
-
+  
 ENDIF ()
 

src/client/inc/tscCache.h

@@ -24,9 +24,9 @@ void *taosOpenConnCache(int maxSessions, void (*cleanFp)(void *), void *tmrCtrl,
 
 void taosCloseConnCache(void *handle);
 
-void *taosAddConnIntoCache(void *handle, void *data, uint32_t ip, short port, char *user);
+void *taosAddConnIntoCache(void *handle, void *data, uint32_t ip, uint16_t port, char *user);
 
-void *taosGetConnFromCache(void *handle, uint32_t ip, short port, char *user);
+void *taosGetConnFromCache(void *handle, uint32_t ip, uint16_t port, char *user);
 
 #ifdef __cplusplus
 }

src/client/inc/tscJoinProcess.h

@@ -0,0 +1,155 @@
+/*
+ * Copyright (c) 2019 TAOS Data, Inc. <jhtao@taosdata.com>
+ *
+ * This program is free software: you can use, redistribute, and/or modify
+ * it under the terms of the GNU Affero General Public License, version 3
+ * or later ("AGPL"), as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef TDENGINE_TSCJOINPROCESS_H
+#define TDENGINE_TSCJOINPROCESS_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#include "tscUtil.h"
+#include "tsclient.h"
+
+void tscFetchDatablockFromSubquery(SSqlObj* pSql);
+void tscGetQualifiedTSList(SSqlObj* pSql, SJoinSubquerySupporter* p1, SJoinSubquerySupporter* p2, int32_t* num);
+
+void tscSetupOutputColumnIndex(SSqlObj* pSql);
+int32_t tscLaunchSecondSubquery(SSqlObj* pSql);
+void tscJoinQueryCallback(void* param, TAOS_RES* tres, int code);
+
+SJoinSubquerySupporter* tscCreateJoinSupporter(SSqlObj* pSql, SSubqueryState* pState, int32_t index);
+void tscDestroyJoinSupporter(SJoinSubquerySupporter* pSupporter);
+
+#define MEM_BUF_SIZE                (1<<20)
+#define TS_COMP_BLOCK_PADDING       0xFFFFFFFF
+#define TS_COMP_FILE_MAGIC          0x87F5EC4C
+#define TS_COMP_FILE_VNODE_MAX      512
+
+typedef struct STSList {
+  char*   rawBuf;
+  int32_t allocSize;
+  int32_t threshold;
+  int32_t len;
+} STSList;
+
+typedef struct STSRawBlock {
+  int32_t vnode;
+  int64_t tag;
+  TSKEY*  ts;
+  int32_t len;
+} STSRawBlock;
+
+typedef struct STSElem {
+  TSKEY   ts;
+  int64_t tag;
+  int32_t vnode;
+} STSElem;
+
+typedef struct STSCursor {
+  int32_t vnodeIndex;
+  int32_t blockIndex;
+  int32_t tsIndex;
+  int32_t order;
+} STSCursor;
+
+typedef struct STSBlock {
+  int64_t tag;        // tag value
+  int32_t numOfElem;  // number of elements
+  int32_t compLen;    // size after compressed
+  int32_t padding;    // 0xFFFFFFFF by default, after the payload
+  char*   payload;    // actual data that is compressed
+} STSBlock;
+
+typedef struct STSVnodeBlockInfo {
+  int32_t vnode;
+
+  /*
+   * The size of buffer file is not expected to be greater than 2G,
+   * and the offset of int32_t type is enough
+   */
+  int32_t offset;
+  int32_t numOfBlocks;
+  int32_t compLen;
+} STSVnodeBlockInfo;
+
+typedef struct STSVnodeBlockInfoEx {
+  STSVnodeBlockInfo info;
+  int32_t           len;  // length before compress
+} STSVnodeBlockInfoEx;
+
+typedef struct STSBuf {
+  FILE*    f;
+  char     path[PATH_MAX];
+  uint32_t fileSize;
+
+  STSVnodeBlockInfoEx* pData;
+  int32_t              numOfAlloc;
+  int32_t              numOfVnodes;
+
+  char*    assistBuf;
+  int32_t  bufSize;
+  STSBlock block;
+  STSList  tsData;  // uncompressed raw ts data
+
+  uint64_t numOfTotal;
+  bool     autoDelete;
+  int32_t  tsOrder; // order of timestamp in ts comp buffer
+
+  STSCursor cur;
+} STSBuf;
+
+typedef struct STSBufFileHeader {
+  uint32_t magic;         // file magic number
+  uint32_t numOfVnode;    // number of vnode stored in current file
+  uint32_t tsOrder;       // timestamp order in current file
+} STSBufFileHeader;
+
+STSBuf* tsBufCreate(bool autoDelete);
+STSBuf* tsBufCreateFromFile(const char* path, bool autoDelete);
+STSBuf* tsBufCreateFromCompBlocks(const char* pData, int32_t numOfBlocks, int32_t len, int32_t tsOrder);
+
+void tsBufDestory(STSBuf* pTSBuf);
+
+void tsBufAppend(STSBuf* pTSBuf, int32_t vnodeId, int64_t tag, const char* pData, int32_t len);
+int32_t tsBufMerge(STSBuf* pDestBuf, const STSBuf* pSrcBuf, int32_t vnodeIdx);
+
+STSVnodeBlockInfo* tsBufGetVnodeBlockInfo(STSBuf* pTSBuf, int32_t vnodeId);
+
+void tsBufFlush(STSBuf* pTSBuf);
+
+void tsBufResetPos(STSBuf* pTSBuf);
+STSElem tsBufGetElem(STSBuf* pTSBuf);
+bool tsBufNextPos(STSBuf* pTSBuf);
+
+STSElem tsBufGetElemStartPos(STSBuf* pTSBuf, int32_t vnodeId, int64_t tag);
+
+STSCursor tsBufGetCursor(STSBuf* pTSBuf);
+void tsBufSetTraverseOrder(STSBuf* pTSBuf, int32_t order);
+
+void tsBufSetCursor(STSBuf* pTSBuf, STSCursor* pCur);
+STSBuf* tsBufClone(STSBuf* pTSBuf);
+
+/**
+ * display all data in comp block file, for debug purpose only
+ * @param pTSBuf
+ */
+void tsBufDisplay(STSBuf* pTSBuf);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif  // TDENGINE_TSCJOINPROCESS_H

src/client/inc/tscSQLParser.h

@@ -23,29 +23,15 @@ extern "C" {
 #include "taos.h"
 #include "tsqldef.h"
 #include "ttypes.h"
-
+#include "taosmsg.h"
-#define TK_SPACE   200
-#define TK_COMMENT 201
-#define TK_ILLEGAL 202
-#define TK_HEX     203
-#define TK_OCT     204
-
-#define TSQL_SO_ASC  1
-#define TSQL_SO_DESC 0
 
 #define MAX_TOKEN_LEN 30
 
-#define TSQL_TBNAME   "TBNAME"
-#define TSQL_TBNAME_L "tbname"
-
-#define TSQL_STABLE_QTYPE_COND 1
-#define TSQL_STABLE_QTYPE_SET  2
-
 // token type
 enum {
-  TSQL_NODE_TYPE_EXPR = 0x1,
+  TSQL_NODE_TYPE_EXPR   = 0x1,
-  TSQL_NODE_TYPE_ID = 0x2,
+  TSQL_NODE_TYPE_ID     = 0x2,
-  TSQL_NODE_TYPE_VALUE = 0x4,
+  TSQL_NODE_TYPE_VALUE  = 0x4,
 };
 
 extern char tTokenTypeSwitcher[13];
@@ -119,6 +105,7 @@ enum TSQL_TYPE {
   SHOW_MODULES = 0x6c,
   SHOW_CONNECTIONS = 0x6d,
   SHOW_GRANTS = 0x6e,
+  SHOW_VNODES = 0x6f,
 
   // create dnode
   CREATE_DNODE = 0x80,
@@ -155,14 +142,14 @@ enum TSQL_TYPE {
 
 typedef struct SQuerySQL {
   struct tSQLExprList *pSelection;   // select clause
-  struct SSQLToken     from;         // from clause
+  tVariantList *       from;         // from clause
   struct tSQLExpr *    pWhere;       // where clause [optional]
   tVariantList *       pGroupby;     // groupby clause, only for tags[optional]
   tVariantList *       pSortOrder;   // orderby [optional]
   SSQLToken            interval;     // interval [optional]
   SSQLToken            sliding;      // sliding window [optional]
   SLimitVal            limit;        // limit offset [optional]
-  SLimitVal            glimit;       // group limit offset [optional]
+  SLimitVal            slimit;       // group limit offset [optional]
   tVariantList *       fillType;     // fill type[optional]
   SSQLToken            selectToken;  // sql string
 } SQuerySQL;
@@ -278,8 +265,7 @@ typedef struct tSQLExpr {
   uint32_t nSQLOptr;  // TK_FUNCTION: sql function, TK_LE: less than(binary expr)
 
   // the full sql string of function(col, param), which is actually the raw
-  // field name,
+  // field name, since the function name is kept in nSQLOptr already
-  // since the function name is kept in nSQLOptr already
   SSQLToken            operand;
   struct tSQLExprList *pParam;  // function parameters
 
@@ -327,12 +313,12 @@ void Parse(void *yyp, int yymajor, ParseTOKENTYPE yyminor, SSqlInfo *);
  */
 void ParseFree(void *p, void (*freeProc)(void *));
 
-tVariantList *tVariantListAppendToken(tVariantList *pList, SSQLToken *pAliasToken, uint8_t sortOrder);
 tVariantList *tVariantListAppend(tVariantList *pList, tVariant *pVar, uint8_t sortOrder);
 
 tVariantList *tVariantListInsert(tVariantList *pList, tVariant *pVar, uint8_t sortOrder, int32_t index);
 
-void tVariantListDestroy(tVariantList *pList);
+tVariantList *tVariantListAppendToken(tVariantList *pList, SSQLToken *pAliasToken, uint8_t sortOrder);
+void          tVariantListDestroy(tVariantList *pList);
 
 tFieldList *tFieldListAppend(tFieldList *pList, TAOS_FIELD *pField);
 
@@ -346,14 +332,15 @@ tSQLExprList *tSQLExprListAppend(tSQLExprList *pList, tSQLExpr *pNode, SSQLToken
 
 void tSQLExprListDestroy(tSQLExprList *pList);
 
-int32_t tSQLSyntaxNodeToString(tSQLExpr *pNode, char *dst);
+SQuerySQL *tSetQuerySQLElems(SSQLToken *pSelectToken, tSQLExprList *pSelection, tVariantList *pFrom, tSQLExpr *pWhere,
-
-SQuerySQL *tSetQuerySQLElems(SSQLToken *pSelectToken, tSQLExprList *pSelection, SSQLToken *pFrom, tSQLExpr *pWhere,
                              tVariantList *pGroupby, tVariantList *pSortOrder, SSQLToken *pInterval,
                              SSQLToken *pSliding, tVariantList *pFill, SLimitVal *pLimit, SLimitVal *pGLimit);
 
 SCreateTableSQL *tSetCreateSQLElems(tFieldList *pCols, tFieldList *pTags, SSQLToken *pMetricName,
                                     tVariantList *pTagVals, SQuerySQL *pSelect, int32_t type);
+void tSQLExprDestroy(tSQLExpr *);
+void tSQLExprNodeDestroy(tSQLExpr *pExpr);
+tSQLExpr *tSQLExprNodeClone(tSQLExpr *pExpr);
 
 SAlterTableSQL *tAlterTableSQLElems(SSQLToken *pMeterName, tFieldList *pCols, tVariantList *pVals, int32_t type);
 
@@ -376,6 +363,7 @@ tDCLSQL *tTokenListAppend(tDCLSQL *pTokenList, SSQLToken *pToken);
 void setCreateDBSQL(SSqlInfo *pInfo, int32_t type, SSQLToken *pToken, SCreateDBInfo *pDB, SSQLToken *pIgExists);
 
 void setCreateAcctSQL(SSqlInfo *pInfo, int32_t type, SSQLToken *pName, SSQLToken *pPwd, SCreateAcctSQL *pAcctInfo);
+void setDefaultCreateDbOption(SCreateDBInfo *pDBInfo);
 
 // prefix show db.tables;
 void setDBName(SSQLToken *pCpxName, SSQLToken *pDB);

src/client/inc/tscSecondaryMerge.h

@@ -52,74 +52,53 @@ enum {
 };
 
 typedef struct SLocalReducer {
-  SLocalDataSource **pLocalDataSrc;
+  SLocalDataSource **    pLocalDataSrc;
-  int32_t         numOfBuffer;
+  int32_t                numOfBuffer;
-  int32_t         numOfCompleted;
+  int32_t                numOfCompleted;
-
+  int32_t                numOfVnode;
-  int32_t numOfVnode;
+  SLoserTreeInfo *       pLoserTree;
-
+  char *                 prevRowOfInput;
-  SLoserTreeInfo *pLoserTree;
+  tFilePage *            pResultBuf;
-  char *          prevRowOfInput;
+  int32_t                nResultBufSize;
-
+  char *                 pBufForInterpo;  // intermediate buffer for interpolation
-  tFilePage *pResultBuf;
+  tFilePage *            pTempBuffer;
-  int32_t    nResultBufSize;
-
-  char *pBufForInterpo;  // intermediate buffer for interpolation
-
-  tFilePage *pTempBuffer;
-
   struct SQLFunctionCtx *pCtx;
-
+  int32_t                rowSize;     // size of each intermediate result.
-  int32_t rowSize;  // size of each intermediate result.
+  int32_t                status;      // denote it is in reduce process, in reduce process, it
-  int32_t status;   // denote it is in reduce process, in reduce process, it
+  bool                   hasPrevRow;  // cannot be released
-  // cannot be released
+  bool                   hasUnprocessedRow;
-  bool hasPrevRow;
+  tOrderDescriptor *     pDesc;
-  bool hasUnprocessedRow;
+  tColModel *            resColModel;
-
+  tExtMemBuffer **       pExtMemBuffer;      // disk-based buffer
-  tOrderDescriptor *pDesc;
+  SInterpolationInfo     interpolationInfo;  // interpolation support structure
-  tColModel *       resColModel;
+  char *                 pFinalRes;          // result data after interpo
-
+  tFilePage *            discardData;
-  tExtMemBuffer **   pExtMemBuffer;      // disk-based buffer
+  SResultInfo *          pResInfo;
-  SInterpolationInfo interpolationInfo;  // interpolation support structure
+  bool                   discard;
-
+  int32_t                offset;             // limit offset value
-  char *pFinalRes;  // result data after interpo
-
-  tFilePage *discardData;
-  bool       discard;
-
-  int32_t offset;
 } SLocalReducer;
 
+typedef struct SSubqueryState {
+  /*
+   * the number of completed retrieval subquery, once this value equals to numOfVnodes,
+   * all retrieval are completed.Local merge is launched.
+   */
+  int32_t  numOfCompleted;
+  int32_t  numOfTotal;          // number of total sub-queries
+  int32_t  code;                // code from subqueries
+  uint64_t numOfRetrievedRows;  // total number of points in this query
+} SSubqueryState;
+
 typedef struct SRetrieveSupport {
-  tExtMemBuffer **  pExtMemBuffer;  // for build loser tree
+  tExtMemBuffer **  pExtMemBuffer;    // for build loser tree
   tOrderDescriptor *pOrderDescriptor;
-  tColModel *       pFinalColModel;  // colModel for final result
+  tColModel *       pFinalColModel;   // colModel for final result
-
+  SSubqueryState *  pState;
-  /*
+  int32_t           vnodeIdx;     // index of current vnode in vnode list
-   * shared by all subqueries
+  SSqlObj *         pParentSqlObj;
-   * It is the number of completed retrieval subquery.
+  tFilePage *       localBuffer;  // temp buffer, there is a buffer for each vnode to
-   * once this value equals to numOfVnodes, all retrieval are completed.
+  uint32_t          numOfRetry;   // record the number of retry times
-   * Local merge is launched.
+  pthread_mutex_t   queryMutex;
-   */
-  int32_t *numOfFinished;
-  int32_t  numOfVnodes;  // total number of vnode
-  int32_t  vnodeIdx;     // index of current vnode in vnode list
-
-  /*
-   * shared by all subqueries
-   * denote the status of query on vnode, if code!=0, all following
-   * retrieval on vnode are aborted.
-   */
-  int32_t *code;
-
-  SSqlObj *  pParentSqlObj;
-  tFilePage *localBuffer;  // temp buffer, there is a buffer for each vnode to
-  // save data
-  uint64_t *numOfTotalRetrievedPoints;  // total number of points in this query
-  // retrieved from server
-
-  uint32_t        numOfRetry;  // record the number of retry times
-  pthread_mutex_t queryMutex;
 } SRetrieveSupport;
 
 int32_t tscLocalReducerEnvCreate(SSqlObj *pSql, tExtMemBuffer ***pMemBuffer, tOrderDescriptor **pDesc,

src/client/inc/tscUtil.h

@@ -23,17 +23,19 @@ extern "C" {
 /*
  * @date   2018/09/30
  */
+#include <limits.h>
 #include <stdio.h>
-#include "tsdb.h"
-#include "tsclient.h"
 #include "textbuffer.h"
+#include "tsclient.h"
+#include "tsdb.h"
+#include "tscSecondaryMerge.h"
 
-#define UTIL_METER_IS_METRIC(cmd) (((cmd)->pMeterMeta != NULL) && ((cmd)->pMeterMeta->meterType == TSDB_METER_METRIC))
+#define UTIL_METER_IS_METRIC(metaInfo) (((metaInfo)->pMeterMeta != NULL) && ((metaInfo)->pMeterMeta->meterType == TSDB_METER_METRIC))
+#define UTIL_METER_IS_NOMRAL_METER(metaInfo) (!(UTIL_METER_IS_METRIC(metaInfo)))
+#define UTIL_METER_IS_CREATE_FROM_METRIC(metaInfo) \
+  (((metaInfo)->pMeterMeta != NULL) && ((metaInfo)->pMeterMeta->meterType == TSDB_METER_MTABLE))
 
-#define UTIL_METER_IS_NOMRAL_METER(cmd) (!(UTIL_METER_IS_METRIC(cmd)))
+#define TSDB_COL_IS_TAG(f) (((f)&TSDB_COL_TAG) != 0)
-
-#define UTIL_METER_IS_CREATE_FROM_METRIC(cmd) \
-  (((cmd)->pMeterMeta != NULL) && ((cmd)->pMeterMeta->meterType == TSDB_METER_MTABLE))
 
 typedef struct SParsedColElem {
   int16_t colIndex;
@@ -47,15 +49,36 @@ typedef struct SParsedDataColInfo {
   bool           hasVal[TSDB_MAX_COLUMNS];
 } SParsedDataColInfo;
 
-STableDataBlocks* tscCreateDataBlock(int32_t size);
+typedef struct SJoinSubquerySupporter {
+  SSubqueryState* pState;
+  SSqlObj*        pObj;           // parent SqlObj
+  bool            hasMore;        // has data from vnode to fetch
+  int32_t         subqueryIndex;  // index of sub query
+  int64_t         interval;       // interval time
+  SLimitVal       limit;          // limit info
+  uint64_t        uid;            // query meter uid
+  SColumnBaseInfo colList;        // previous query information
+  SSqlExprInfo    exprsInfo;
+  SFieldInfo      fieldsInfo;
+  STagCond        tagCond;
+  SSqlGroupbyExpr groupbyExpr;
+
+  struct STSBuf* pTSBuf;
+
+  FILE* f;
+  char  path[PATH_MAX];
+} SJoinSubquerySupporter;
+
 void tscDestroyDataBlock(STableDataBlocks* pDataBlock);
+STableDataBlocks* tscCreateDataBlock(int32_t size);
 void tscAppendDataBlock(SDataBlockList* pList, STableDataBlocks* pBlocks);
+SParamInfo* tscAddParamToDataBlock(STableDataBlocks* pDataBlock, char type, uint8_t timePrec, short bytes, uint32_t offset);
 
 SDataBlockList* tscCreateBlockArrayList();
 void* tscDestroyBlockArrayList(SDataBlockList* pList);
 int32_t tscCopyDataBlockToPayload(SSqlObj* pSql, STableDataBlocks* pDataBlock);
 void tscFreeUnusedDataBlocks(SDataBlockList* pList);
-void tscMergeTableDataBlocks(SSqlObj* pSql, SDataBlockList* pDataList);
+int32_t tscMergeTableDataBlocks(SSqlObj* pSql, SDataBlockList* pDataList);
 STableDataBlocks* tscGetDataBlockFromList(void* pHashList, SDataBlockList* pDataBlockList, int64_t id, int32_t size,
                                           int32_t startOffset, int32_t rowSize, char* tableId);
 STableDataBlocks* tscCreateDataBlockEx(size_t size, int32_t rowSize, int32_t startOffset, char* name);
@@ -63,9 +86,6 @@ STableDataBlocks* tscCreateDataBlockEx(size_t size, int32_t rowSize, int32_t sta
 SVnodeSidList* tscGetVnodeSidList(SMetricMeta* pMetricmeta, int32_t vnodeIdx);
 SMeterSidExtInfo* tscGetMeterSidInfo(SVnodeSidList* pSidList, int32_t idx);
 
-bool tscProjectionQueryOnMetric(SSqlObj* pSql);
-bool tscIsTwoStageMergeMetricQuery(SSqlObj* pSql);
-
 /**
  *
  * for the projection query on metric or point interpolation query on metric,
@@ -73,52 +93,75 @@ bool tscIsTwoStageMergeMetricQuery(SSqlObj* pSql);
  *
  * @param pSql  sql object
  * @return
- *
  */
-bool tscIsFirstProjQueryOnMetric(SSqlObj* pSql);
 bool tscIsPointInterpQuery(SSqlCmd* pCmd);
-void tscClearInterpInfo(SSqlCmd* pCmd);
+bool tscIsTWAQuery(SSqlCmd* pCmd);
+bool tscProjectionQueryOnMetric(SSqlCmd* pCmd);
+bool tscIsTwoStageMergeMetricQuery(SSqlCmd* pCmd);
+bool tscQueryOnMetric(SSqlCmd* pCmd);
+bool tscQueryMetricTags(SSqlCmd* pCmd);
+bool tscIsSelectivityWithTagQuery(SSqlCmd* pCmd);
 
-int32_t setMeterID(SSqlObj* pSql, SSQLToken* pzTableName);
+void tscAddSpecialColumnForSelect(SSqlCmd* pCmd, int32_t outputColIndex, int16_t functionId, SColumnIndex* pIndex,
+                                  SSchema* pColSchema, int16_t isTag);
+
+void addRequiredTagColumn(SSqlCmd* pCmd, int32_t tagColIndex, int32_t tableIndex);
+
+//TODO refactor, remove
+void SStringFree(SString* str);
+void SStringCopy(SString* pDest, const SString* pSrc);
+SString SStringCreate(const char* str);
+
+int32_t SStringAlloc(SString* pStr, int32_t size);
+int32_t SStringEnsureRemain(SString* pStr, int32_t size);
+
+int32_t setMeterID(SSqlObj* pSql, SSQLToken* pzTableName, int32_t tableIndex);
+void tscClearInterpInfo(SSqlCmd* pCmd);
 
 bool tscIsInsertOrImportData(char* sqlstr);
 
 /* use for keep current db info temporarily, for handle table with db prefix */
 void tscGetDBInfoFromMeterId(char* meterId, char* db);
 
-void tscGetMetricMetaCacheKey(SSqlCmd* pCmd, char* keyStr);
+int tscAllocPayload(SSqlCmd* pCmd, int size);
-bool tscQueryOnMetric(SSqlCmd* pCmd);
-
-int tscAllocPayloadWithSize(SSqlCmd* pCmd, int size);
 
 void tscFieldInfoSetValFromSchema(SFieldInfo* pFieldInfo, int32_t index, SSchema* pSchema);
 void tscFieldInfoSetValFromField(SFieldInfo* pFieldInfo, int32_t index, TAOS_FIELD* pField);
-void tscFieldInfoSetValue(SFieldInfo* pFieldInfo, int32_t index, int8_t type, char* name, int16_t bytes);
+void tscFieldInfoSetValue(SFieldInfo* pFieldInfo, int32_t index, int8_t type, const char* name, int16_t bytes);
+void tscFieldInfoUpdateVisible(SFieldInfo* pFieldInfo, int32_t index, bool visible);
 
 void tscFieldInfoCalOffset(SSqlCmd* pCmd);
-void tscFieldInfoRenewOffsetForInterResult(SSqlCmd* pCmd);
+void tscFieldInfoUpdateOffset(SSqlCmd* pCmd);
-void tscFieldInfoClone(SFieldInfo* src, SFieldInfo* dst);
+void tscFieldInfoCopy(SFieldInfo* src, SFieldInfo* dst, const int32_t* indexList, int32_t size);
+void tscFieldInfoCopyAll(SFieldInfo* src, SFieldInfo* dst);
 
 TAOS_FIELD* tscFieldInfoGetField(SSqlCmd* pCmd, int32_t index);
 int16_t tscFieldInfoGetOffset(SSqlCmd* pCmd, int32_t index);
 int32_t tscGetResRowLength(SSqlCmd* pCmd);
-void tscClearFieldInfo(SSqlCmd* pCmd);
+void tscClearFieldInfo(SFieldInfo* pFieldInfo);
 
-void addExprParams(SSqlExpr* pExpr, char* argument, int32_t type, int32_t bytes);
+void addExprParams(SSqlExpr* pExpr, char* argument, int32_t type, int32_t bytes, int16_t tableIndex);
+
+SSqlExpr* tscSqlExprInsert(SSqlCmd* pCmd, int32_t index, int16_t functionId, SColumnIndex* pColIndex, int16_t type,
+                           int16_t size, int16_t interSize);
+SSqlExpr* tscSqlExprInsertEmpty(SSqlCmd* pCmd, int32_t index, int16_t functionId);
 
-SSqlExpr* tscSqlExprInsert(SSqlCmd* pCmd, int32_t index, int16_t functionId, int16_t srcColumnIndex, int16_t type,
-                           int16_t size);
 SSqlExpr* tscSqlExprUpdate(SSqlCmd* pCmd, int32_t index, int16_t functionId, int16_t srcColumnIndex, int16_t type,
                            int16_t size);
 
 SSqlExpr* tscSqlExprGet(SSqlCmd* pCmd, int32_t index);
-void tscSqlExprClone(SSqlExprInfo* src, SSqlExprInfo* dst);
+void tscSqlExprCopy(SSqlExprInfo* dst, const SSqlExprInfo* src, uint64_t uid);
 
-SColumnBase* tscColumnInfoInsert(SSqlCmd* pCmd, int32_t colIndex);
+SColumnBase* tscColumnBaseInfoInsert(SSqlCmd* pCmd, SColumnIndex* colIndex);
+void tscColumnFilterInfoCopy(SColumnFilterInfo* dst, const SColumnFilterInfo* src);
+void tscColumnBaseCopy(SColumnBase* dst, const SColumnBase* src);
 
-void tscColumnInfoClone(SColumnsInfo* src, SColumnsInfo* dst);
+void tscColumnBaseInfoCopy(SColumnBaseInfo* dst, const SColumnBaseInfo* src, int16_t tableIndex);
-SColumnBase* tscColumnInfoGet(SSqlCmd* pCmd, int32_t index);
+SColumnBase* tscColumnBaseInfoGet(SColumnBaseInfo* pColumnBaseInfo, int32_t index);
-void tscColumnInfoReserve(SSqlCmd* pCmd, int32_t size);
+void tscColumnBaseInfoUpdateTableIndex(SColumnBaseInfo* pColList, int16_t tableIndex);
+
+void tscColumnBaseInfoReserve(SColumnBaseInfo* pColumnBaseInfo, int32_t size);
+void tscColumnBaseInfoDestroy(SColumnBaseInfo* pColumnBaseInfo);
 
 int32_t tscValidateName(SSQLToken* pToken);
 
@@ -127,8 +170,10 @@ void tscIncStreamExecutionCount(void* pStream);
 bool tscValidateColumnId(SSqlCmd* pCmd, int32_t colId);
 
 // get starter position of metric query condition (query on tags) in SSqlCmd.payload
-char* tsGetMetricQueryCondPos(STagCond* pCond);
+SCond* tsGetMetricQueryCondPos(STagCond* pCond, uint64_t tableIndex);
-void tscTagCondAssign(STagCond* pDst, STagCond* pSrc);
+void tsSetMetricQueryCond(STagCond* pTagCond, uint64_t uid, const char* str);
+
+void tscTagCondCopy(STagCond* dest, const STagCond* src);
 void tscTagCondRelease(STagCond* pCond);
 void tscTagCondSetQueryCondType(STagCond* pCond, int16_t type);
 
@@ -138,8 +183,54 @@ void tscSetFreeHeatBeat(STscObj* pObj);
 bool tscShouldFreeHeatBeat(SSqlObj* pHb);
 void tscCleanSqlCmd(SSqlCmd* pCmd);
 bool tscShouldFreeAsyncSqlObj(SSqlObj* pSql);
+
+void tscRemoveAllMeterMetaInfo(SSqlCmd* pCmd, bool removeFromCache);
+SMeterMetaInfo* tscGetMeterMetaInfo(SSqlCmd* pCmd, int32_t index);
+SMeterMetaInfo* tscGetMeterMetaInfoByUid(SSqlCmd* pCmd, uint64_t uid, int32_t* index);
+void tscClearMeterMetaInfo(SMeterMetaInfo* pMeterMetaInfo, bool removeFromCache);
+
+SMeterMetaInfo* tscAddMeterMetaInfo(SSqlCmd* pCmd, const char* name, SMeterMeta* pMeterMeta, SMetricMeta* pMetricMeta,
+                                    int16_t numOfTags, int16_t* tags);
+SMeterMetaInfo* tscAddEmptyMeterMetaInfo(SSqlCmd* pCmd);
+
+void tscGetMetricMetaCacheKey(SSqlCmd* pCmd, char* keyStr, uint64_t uid);
+int tscGetMetricMeta(SSqlObj* pSql);
+int tscGetMeterMeta(SSqlObj* pSql, char* meterId, int32_t tableIndex);
+int tscGetMeterMetaEx(SSqlObj* pSql, char* meterId, bool createIfNotExists);
+
+void tscResetForNextRetrieve(SSqlRes* pRes);
+
+void tscAddTimestampColumn(SSqlCmd* pCmd, int16_t functionId, int16_t tableIndex);
 void tscDoQuery(SSqlObj* pSql);
 
+/**
+ * The create object function must be successful expect for the out of memory issue.
+ *
+ * Therefore, the metermeta/metricmeta object is directly passed to the newly created subquery object from the
+ * previous sql object, instead of retrieving the metermeta/metricmeta from cache.
+ *
+ * Because the metermeta/metricmeta may have been released by other threads, resulting in the retrieving failed as
+ * well as the create function.
+ *
+ * @param pSql
+ * @param vnodeIndex
+ * @param tableIndex
+ * @param fp
+ * @param param
+ * @param pPrevSql
+ * @return
+ */
+SSqlObj* createSubqueryObj(SSqlObj* pSql, int32_t vnodeIndex, int16_t tableIndex, void (*fp)(), void* param,
+                           SSqlObj* pPrevSql);
+void addGroupInfoForSubquery(SSqlObj* pParentObj, SSqlObj* pSql, int32_t tableIndex);
+
+void doAddGroupColumnForSubquery(SSqlCmd* pCmd, int32_t tagIndex);
+
+int16_t tscGetJoinTagColIndexByUid(SSqlCmd* pCmd, uint64_t uid);
+
+TAOS* taos_connect_a(char* ip, char* user, char* pass, char* db, uint16_t port, void (*fp)(void*, TAOS_RES*, int),
+                     void* param, void** taos);
+
 void sortRemoveDuplicates(STableDataBlocks* dataBuf);
 #ifdef __cplusplus
 }

src/client/inc/tsclient.h

@@ -34,8 +34,8 @@ extern "C" {
 #include "tglobalcfg.h"
 #include "tlog.h"
 #include "tscCache.h"
+#include "tscSQLParser.h"
 #include "tsdb.h"
-#include "tsql.h"
 #include "tsqlfunction.h"
 #include "tutil.h"
 
@@ -63,9 +63,9 @@ enum _sql_cmd {
   TSDB_SQL_ALTER_DB,
   TSDB_SQL_CREATE_MNODE,
   TSDB_SQL_DROP_MNODE,
-  TSDB_SQL_CREATE_PNODE,
+  TSDB_SQL_CREATE_DNODE,
-  TSDB_SQL_DROP_PNODE,
+  TSDB_SQL_DROP_DNODE,
-  TSDB_SQL_CFG_PNODE,  // 20
+  TSDB_SQL_CFG_DNODE,  // 20
   TSDB_SQL_CFG_MNODE,
   TSDB_SQL_SHOW,
   TSDB_SQL_RETRIEVE,
@@ -78,15 +78,26 @@ enum _sql_cmd {
   TSDB_SQL_USE_DB,
   TSDB_SQL_META,  // 30
   TSDB_SQL_METRIC,
+  TSDB_SQL_MULTI_META,
   TSDB_SQL_HB,
 
   TSDB_SQL_LOCAL,  // SQL below for client local
   TSDB_SQL_DESCRIBE_TABLE,
   TSDB_SQL_RETRIEVE_METRIC,
+  TSDB_SQL_METRIC_JOIN_RETRIEVE,
   TSDB_SQL_RETRIEVE_TAGS,
-  TSDB_SQL_RETRIEVE_EMPTY_RESULT,  // build empty result instead of accessing
+  /*
-                                   // dnode to fetch result
+   * build empty result instead of accessing dnode to fetch result
-  TSDB_SQL_RESET_CACHE,            // reset the client cache
+   * reset the client cache
+   */
+  TSDB_SQL_RETRIEVE_EMPTY_RESULT,
+
+  TSDB_SQL_RESET_CACHE,  // 40
+  TSDB_SQL_SERV_STATUS,
+  TSDB_SQL_CURRENT_DB,
+  TSDB_SQL_SERV_VERSION,
+  TSDB_SQL_CLI_VERSION,
+  TSDB_SQL_CURRENT_USER,
   TSDB_SQL_CFG_LOCAL,
 
   TSDB_SQL_MAX
@@ -96,24 +107,35 @@ enum _sql_cmd {
 struct SSqlInfo;
 
 typedef struct SSqlGroupbyExpr {
-  int16_t numOfGroupbyCols;
+  int16_t tableIndex;
-  int16_t tagIndex[TSDB_MAX_TAGS]; /* group by columns information */
+
-  int16_t orderIdx;                /* order by column index        */
+  int16_t     numOfGroupCols;
-  int16_t orderType;               /* order by type: asc/desc      */
+  SColIndexEx columnInfo[TSDB_MAX_TAGS];  // group by columns information
+
+  int16_t orderIndex;  // order by column index
+  int16_t orderType;   // order by type: asc/desc
 } SSqlGroupbyExpr;
 
+typedef struct SMeterMetaInfo {
+  SMeterMeta * pMeterMeta;   // metermeta
+  SMetricMeta *pMetricMeta;  // metricmeta
+
+  char    name[TSDB_METER_ID_LEN + 1];
+  int16_t numOfTags;                      // total required tags in query, including groupby tags
+  int16_t tagColumnIndex[TSDB_MAX_TAGS];  // clause + tag projection
+} SMeterMetaInfo;
+
 /* the structure for sql function in select clause */
 typedef struct SSqlExpr {
-  char aliasName[TSDB_COL_NAME_LEN + 1];  // as aliasName
+  char        aliasName[TSDB_COL_NAME_LEN + 1];  // as aliasName
-
+  SColIndexEx colInfo;
-  SColIndex colInfo;
+  int64_t     uid;            // refactor use the pointer
-  int16_t   sqlFuncId;  // function id in aAgg array
+  int16_t     functionId;     // function id in aAgg array
-
+  int16_t     resType;        // return value type
-  int16_t resType;      // return value type
+  int16_t     resBytes;       // length of return value
-  int16_t resBytes;     // length of return value
+  int16_t     interResBytes;  // inter result buffer size
-
+  int16_t     numOfParams;    // argument value of each function
-  int16_t  numOfParams;  // argument value of each function
+  tVariant    param[3];       // parameters are not more than 3
-  tVariant param[3];     // parameters are not more than 3
 } SSqlExpr;
 
 typedef struct SFieldInfo {
@@ -121,6 +143,15 @@ typedef struct SFieldInfo {
   int16_t     numOfAlloc;       // allocated size
   TAOS_FIELD *pFields;
   short *     pOffset;
+
+  /*
+   * define if this column is belong to the queried result, it may be add by parser to faciliate
+   * the query process
+   *
+   * NOTE: these hidden columns always locate at the end of the output columns
+   */
+  bool *  pVisibleCols;
+  int32_t numOfHiddenCols;  // the number of column not belongs to the queried result columns
 } SFieldInfo;
 
 typedef struct SSqlExprInfo {
@@ -129,87 +160,121 @@ typedef struct SSqlExprInfo {
   SSqlExpr *pExprs;
 } SSqlExprInfo;
 
+typedef struct SColumnIndex {
+  int16_t tableIndex;
+  int16_t columnIndex;
+} SColumnIndex;
+
 typedef struct SColumnBase {
-  int16_t colIndex;
+  SColumnIndex       colIndex;
-
+  int32_t            numOfFilters;
-  /* todo refactor: the following data is belong to one struct */
+  SColumnFilterInfo *filterInfo;
-  int16_t filterOn; /* denote if the filter is active       */
-  int16_t lowerRelOptr;
-  int16_t upperRelOptr;
-  int16_t filterOnBinary; /* denote if current column is binary   */
-
-  union {
-    struct {
-      int64_t lowerBndi;
-      int64_t upperBndi;
-    };
-    struct {
-      double lowerBndd;
-      double upperBndd;
-    };
-    struct {
-      int64_t pz;
-      int64_t len;
-    };
-  };
 } SColumnBase;
 
-typedef struct SColumnsInfo {
+typedef struct SColumnBaseInfo {
   int16_t      numOfAlloc;
   int16_t      numOfCols;
   SColumnBase *pColList;
-} SColumnsInfo;
+} SColumnBaseInfo;
 
 struct SLocalReducer;
 
+// todo move to utility
+typedef struct SString {
+  int32_t alloc;
+  int32_t n;
+  char *  z;
+} SString;
+
+typedef struct SCond {
+  uint64_t uid;
+  SString  cond;
+} SCond;
+
+typedef struct SJoinNode {
+  char     meterId[TSDB_METER_ID_LEN];
+  uint64_t uid;
+  int16_t  tagCol;
+} SJoinNode;
+
+typedef struct SJoinInfo {
+  bool      hasJoin;
+  SJoinNode left;
+  SJoinNode right;
+} SJoinInfo;
+
 typedef struct STagCond {
-  int32_t len;
+  // relation between tbname list and query condition, including : TK_AND or TK_OR
-  int32_t allocSize;
+  int16_t relType;
-  int16_t type;
+
-  char *  pData;
+  // tbname query condition, only support tbname query condition on one table
+  SCond tbnameCond;
+
+  // join condition, only support two tables join currently
+  SJoinInfo joinInfo;
+
+  // for different table, the query condition must be seperated
+  SCond   cond[TSDB_MAX_JOIN_TABLE_NUM];
+  int16_t numOfTagCond;
 } STagCond;
 
+typedef struct SParamInfo {
+  int32_t  idx;
+  char     type;
+  uint8_t  timePrec;
+  short    bytes;
+  uint32_t offset;
+} SParamInfo;
+
 typedef struct STableDataBlocks {
-  char        meterId[TSDB_METER_ID_LEN];
+  char   meterId[TSDB_METER_ID_LEN];
-  int8_t      tsSource;
+  int8_t tsSource;
+  bool   ordered;
 
-  int64_t     vgid;
+  int64_t vgid;
-  int64_t     size;
+  int64_t prevTS;
 
-  int64_t     prevTS;
+  int32_t numOfMeters;
-  bool        ordered;
 
-  int32_t     numOfMeters;
+  int32_t  rowSize;
-  int32_t     rowSize;
+  uint32_t nAllocSize;
-  uint32_t    nAllocSize;
+  uint32_t size;
   union {
     char *filename;
     char *pData;
   };
+
+  // for parameter ('?') binding
+  uint32_t    numOfAllocedParams;
+  uint32_t    numOfParams;
+  SParamInfo *params;
 } STableDataBlocks;
 
 typedef struct SDataBlockList {
-  int32_t               idx;
+  int32_t            idx;
-  int32_t               nSize;
+  int32_t            nSize;
-  int32_t               nAlloc;
+  int32_t            nAlloc;
-  char *                userParam; /* user assigned parameters for async query */
+  char *             userParam; /* user assigned parameters for async query */
-  void *                udfp;      /* user defined function pointer, used in async model */
+  void *             udfp;      /* user defined function pointer, used in async model */
   STableDataBlocks **pData;
 } SDataBlockList;
 
 typedef struct {
-  char            name[TSDB_METER_ID_LEN];
+  SOrderVal order;
-  SOrderVal       order;
+  int       command;
-  int             command;
+  int       count;// TODO refactor
-  int             count;
+
-  int16_t         isInsertFromFile;  // load data from file or not
+  union {
-  int16_t         metricQuery;       // metric query or not
+    bool   existsCheck;       // check if the table exists
-  bool            existsCheck;
+    int8_t showType;          // show command type
+  };
+  
+  int8_t          isInsertFromFile;  // load data from file or not
+  bool            import;     // import/insert type
   char            msgType;
-  char            type;
+  uint16_t        type;  // query type
   char            intervalTimeUnit;
-  int64_t         etime;
+  int64_t         etime, stime;
-  int64_t         stime;
   int64_t         nAggTimeInterval;  // aggregation time interval
   int64_t         nSlidingTime;      // sliding window in mseconds
   SSqlGroupbyExpr groupbyExpr;       // group by tags info
@@ -220,28 +285,31 @@ typedef struct {
    *
    * In such cases, allocate the memory dynamically, and need to free the memory
    */
-  uint32_t     allocSize;
+  uint32_t        allocSize;
-  char *       payload;
+  char *          payload;
-  int          payloadLen;
+  int             payloadLen;
-  short        numOfCols;
+  short           numOfCols;
-  SColumnsInfo colList;
+  SColumnBaseInfo colList;
-  SFieldInfo   fieldsInfo;
+  SFieldInfo      fieldsInfo;
-  SSqlExprInfo exprsInfo;
+  SSqlExprInfo    exprsInfo;
-  int16_t      numOfReqTags;  // total required tags in query, inlcuding groupby clause + tag projection
+  SLimitVal       limit;
-  int16_t      tagColumnIndex[TSDB_MAX_TAGS + 1];
+  SLimitVal       slimit;
-  SLimitVal    limit;
+  int64_t         globalLimit;
-  int64_t      globalLimit;
+  STagCond        tagCond;
-  SLimitVal    glimit;
+  int16_t         vnodeIdx;     // vnode index in pMetricMeta for metric query
-  STagCond     tagCond;
+  int16_t         interpoType;  // interpolate type
-  int16_t      vnodeIdx;     // vnode index in pMetricMeta for metric query
+  int16_t         numOfTables;
-  int16_t      interpoType;  // interpolate type
-
-  SDataBlockList *pDataBlocks;  // submit data blocks branched according to vnode
-  SMeterMeta *    pMeterMeta;   // metermeta
-  SMetricMeta *   pMetricMeta;  // metricmeta
 
+  // submit data blocks branched according to vnode
+  SDataBlockList * pDataBlocks;
+  SMeterMetaInfo **pMeterInfo;
+  struct STSBuf *  tsBuf;
   // todo use dynamic allocated memory for defaultVal
   int64_t defaultVal[TSDB_MAX_COLUMNS];  // default value for interpolation
+
+  // for parameter ('?') binding and batch processing
+  int32_t batchSize;
+  int32_t numOfParams;
 } SSqlCmd;
 
 typedef struct SResRec {
@@ -249,39 +317,40 @@ typedef struct SResRec {
   int numOfTotal;
 } SResRec;
 
-typedef struct {
+struct STSBuf;
-  uint8_t  code;
-  int      numOfRows;   // num of results in current retrieved
-  int      numOfTotal;  // num of total results
-  char *   pRsp;
-  int      rspType;
-  int      rspLen;
-  uint64_t qhandle;
-  int64_t  useconds;
-  int64_t  offset;  // offset value from vnode during projection query of stable
-  int      row;
-  int16_t  numOfnchar;
-  int16_t  precision;
-  int32_t  numOfGroups;
-  SResRec *pGroupRec;
-  char *   data;
-  short *  bytes;
-  void **  tsrow;
 
-  // Buffer used to put multibytes encoded using unicode (wchar_t)
+typedef struct {
-  char **               buffer;
+  uint8_t               code;
+  int                   numOfRows;   // num of results in current retrieved
+  int                   numOfTotal;  // num of total results
+  char *                pRsp;
+  int                   rspType;
+  int                   rspLen;
+  uint64_t              qhandle;
+  int64_t               useconds;
+  int64_t               offset;  // offset value from vnode during projection query of stable
+  int                   row;
+  int16_t               numOfnchar;
+  int16_t               precision;
+  int32_t               numOfGroups;
+  SResRec *             pGroupRec;
+  char *                data;
+  short *               bytes;
+  void **               tsrow;
+  char **               buffer;  // Buffer used to put multibytes encoded using unicode (wchar_t)
   struct SLocalReducer *pLocalReducer;
+  SColumnIndex *        pColumnIndex;
 } SSqlRes;
 
 typedef struct _tsc_obj {
   void *           signature;
   void *           pTimer;
   char             mgmtIp[TSDB_USER_LEN];
-  short            mgmtPort;
+  uint16_t         mgmtPort;
   char             user[TSDB_USER_LEN];
   char             pass[TSDB_KEY_LEN];
   char             acctId[TSDB_DB_NAME_LEN];
-  char             db[TSDB_DB_NAME_LEN];
+  char             db[TSDB_METER_ID_LEN];
   char             sversion[TSDB_VERSION_LEN];
   char             writeAuth : 1;
   char             superAuth : 1;
@@ -328,7 +397,7 @@ typedef struct _sstream {
   int64_t  num;  // number of computing count
 
   /*
-   * bookmark the current number of result in computing,
+   * keep the number of current result in computing,
    * the value will be set to 0 before set timer for next computing
    */
   int64_t numOfRes;
@@ -336,8 +405,7 @@ typedef struct _sstream {
   int64_t useconds;  // total  elapsed time
   int64_t ctime;     // stream created time
   int64_t stime;     // stream next executed time
-  int64_t etime;     // stream end query time, when time is larger then etime, the
+  int64_t etime;     // stream end query time, when time is larger then etime, the stream will be closed
-                     // stream will be closed
   int64_t interval;
   int64_t slidingTime;
   int16_t precision;
@@ -346,8 +414,7 @@ typedef struct _sstream {
   void (*fp)();
   void *param;
 
-  // Call backfunction when stream is stopped from client level
+  void (*callback)(void *);  // Callback function when stream is stopped from client level
-  void (*callback)(void *);
   struct _sstream *prev, *next;
 } SSqlStream;
 
@@ -362,15 +429,13 @@ int tsParseSql(SSqlObj *pSql, char *acct, char *db, bool multiVnodeInsertion);
 
 void  tscInitMsgs();
 void *tscProcessMsgFromServer(char *msg, void *ahandle, void *thandle);
-int tscProcessSql(SSqlObj *pSql);
+int   tscProcessSql(SSqlObj *pSql);
-int tscGetMeterMeta(SSqlObj *pSql, char *meterId);
-int tscGetMeterMetaEx(SSqlObj *pSql, char *meterId, bool createIfNotExists);
 
 void tscAsyncInsertMultiVnodesProxy(void *param, TAOS_RES *tres, int numOfRows);
 
-int tscRenewMeterMeta(SSqlObj *pSql, char *meterId);
+int  tscRenewMeterMeta(SSqlObj *pSql, char *meterId);
 void tscQueueAsyncRes(SSqlObj *pSql);
-int tscGetMetricMeta(SSqlObj *pSql, char *meterId);
+
 void tscQueueAsyncError(void(*fp), void *param);
 
 int tscProcessLocalCmd(SSqlObj *pSql);
@@ -381,21 +446,15 @@ int taos_retrieve(TAOS_RES *res);
  * transfer function for metric query in stream computing, the function need to be change
  * before send query message to vnode
  */
-void tscTansformSQLFunctionForMetricQuery(SSqlCmd *pCmd);
+int32_t tscTansformSQLFunctionForMetricQuery(SSqlCmd *pCmd);
-void tscRestoreSQLFunctionForMetricQuery(SSqlCmd *pCmd);
+void    tscRestoreSQLFunctionForMetricQuery(SSqlCmd *pCmd);
-
-/**
- * release both metric/meter meta information
- * @param pCmd  SSqlCmd object that contains the metric/meter meta info
- */
-void tscClearSqlMetaInfo(SSqlCmd *pCmd);
 
 void tscClearSqlMetaInfoForce(SSqlCmd *pCmd);
 
 int32_t tscCreateResPointerInfo(SSqlCmd *pCmd, SSqlRes *pRes);
-void tscDestroyResPointerInfo(SSqlRes *pRes);
+void    tscDestroyResPointerInfo(SSqlRes *pRes);
 
-void tscfreeSqlCmdData(SSqlCmd *pCmd);
+void tscFreeSqlCmdData(SSqlCmd *pCmd);
 
 /**
  * only free part of resources allocated during query.
@@ -413,40 +472,30 @@ void tscFreeSqlObj(SSqlObj *pObj);
 
 void tscCloseTscObj(STscObj *pObj);
 
-//
+void    tscProcessMultiVnodesInsert(SSqlObj *pSql);
-// support functions for async metric query.
+void    tscProcessMultiVnodesInsertForFile(SSqlObj *pSql);
-// we declare them as global visible functions, because we need them to check if a
+void    tscKillMetricQuery(SSqlObj *pSql);
-// failed async query in tscMeterMetaCallBack is a metric query or not.
+void    tscInitResObjForLocalQuery(SSqlObj *pObj, int32_t numOfRes, int32_t rowLen);
-
+bool    tscIsUpdateQuery(STscObj *pObj);
-// expr: (fp == tscRetrieveDataRes or fp == tscRetrieveFromVnodeCallBack)
+int32_t tscInvalidSQLErrMsg(char *msg, const char *additionalInfo, const char *sql);
-// If a query is async query, we simply abort current query process, instead of continuing
-//
-void tscRetrieveDataRes(void *param, TAOS_RES *tres, int numOfRows);
-void tscRetrieveFromVnodeCallBack(void *param, TAOS_RES *tres, int numOfRows);
-
-void tscProcessMultiVnodesInsert(SSqlObj *pSql);
-void tscProcessMultiVnodesInsertForFile(SSqlObj *pSql);
-void tscKillMetricQuery(SSqlObj *pSql);
-void tscInitResObjForLocalQuery(SSqlObj *pObj, int32_t numOfRes, int32_t rowLen);
-int32_t tscBuildResultsForEmptyRetrieval(SSqlObj *pSql);
 
 // transfer SSqlInfo to SqlCmd struct
 int32_t tscToSQLCmd(SSqlObj *pSql, struct SSqlInfo *pInfo);
 
 void tscQueueAsyncFreeResult(SSqlObj *pSql);
 
-extern void *   pVnodeConn;
+extern void *     pVnodeConn;
-extern void *   pTscMgmtConn;
+extern void *     pTscMgmtConn;
-extern void *   tscCacheHandle;
+extern void *     tscCacheHandle;
-extern uint8_t  globalCode;
+extern uint8_t    globalCode;
-extern int      slaveIndex;
+extern int        slaveIndex;
-extern void *   tscTmr;
+extern void *     tscTmr;
-extern void *   tscConnCache;
+extern void *     tscConnCache;
-extern void *   tscQhandle;
+extern void *     tscQhandle;
-extern int      tscKeepConn[];
+extern int        tscKeepConn[];
-extern int      tsInsertHeadSize;
+extern int        tsInsertHeadSize;
-extern int      tscNumOfThreads;
+extern int        tscNumOfThreads;
-extern uint32_t tsServerIp;
+extern SIpStrList tscMgmtIpList;
 
 #ifdef __cplusplus
 }

src/client/jni/com_taosdata_jdbc_TSDBJNIConnector.h

@@ -9,6 +9,22 @@ extern "C" {
 #endif
 #undef com_taosdata_jdbc_TSDBJNIConnector_INVALID_CONNECTION_POINTER_VALUE
 #define com_taosdata_jdbc_TSDBJNIConnector_INVALID_CONNECTION_POINTER_VALUE 0LL
+/*
+ * Class:     com_taosdata_jdbc_TSDBJNIConnector
+ * Method:    
+ * Signature: (Ljava/lang/String;)V
+ */
+JNIEXPORT void JNICALL Java_com_taosdata_jdbc_TSDBJNIConnector_setAllocModeImp
+  (JNIEnv *, jclass, jint, jstring, jboolean);
+
+/*
+ * Class:     com_taosdata_jdbc_TSDBJNIConnector
+ * Method:    
+ * Signature: ()Ljava/lang/String;
+ */
+JNIEXPORT void JNICALL Java_com_taosdata_jdbc_TSDBJNIConnector_dumpMemoryLeakImp
+  (JNIEnv *, jclass);
+
 /*
  * Class:     com_taosdata_jdbc_TSDBJNIConnector
  * Method:    initImp

src/client/src/TSDBJNIConnector.c

@@ -13,12 +13,11 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <stdbool.h>
-
 #include "os.h"
 #include "com_taosdata_jdbc_TSDBJNIConnector.h"
 #include "taos.h"
 #include "tlog.h"
+#include "tscJoinProcess.h"
 #include "tsclient.h"
 #include "tscUtil.h"
 
@@ -62,13 +61,13 @@ jmethodID g_rowdataSetByteArrayFp;
 
 void jniGetGlobalMethod(JNIEnv *env) {
   // make sure init function executed once
-  switch (__sync_val_compare_and_swap_32(&__init, 0, 1)) {
+  switch (atomic_val_compare_exchange_32(&__init, 0, 1)) {
     case 0:
       break;
     case 1:
       do {
         taosMsleep(0);
-      } while (__sync_val_load_32(&__init) == 1);
+      } while (atomic_load_32(&__init) == 1);
     case 2:
       return;
   }
@@ -108,10 +107,24 @@ void jniGetGlobalMethod(JNIEnv *env) {
   g_rowdataSetByteArrayFp = (*env)->GetMethodID(env, g_rowdataClass, "setByteArray", "(I[B)V");
   (*env)->DeleteLocalRef(env, rowdataClass);
 
-  __sync_val_restore_32(&__init, 2);
+  atomic_store_32(&__init, 2);
   jniTrace("native method register finished");
 }
 
+JNIEXPORT void JNICALL Java_com_taosdata_jdbc_TSDBJNIConnector_setAllocModeImp(JNIEnv *env, jobject jobj, jint jMode, jstring jPath, jboolean jAutoDump) {
+  if (jPath != NULL) {
+    const char *path = (*env)->GetStringUTFChars(env, jPath, NULL);
+    taosSetAllocMode(jMode, path, !!jAutoDump);
+    (*env)->ReleaseStringUTFChars(env, jPath, path);
+  } else {
+    taosSetAllocMode(jMode, NULL, !!jAutoDump);
+  }
+}
+
+JNIEXPORT void JNICALL Java_com_taosdata_jdbc_TSDBJNIConnector_dumpMemoryLeakImp(JNIEnv *env, jobject jobj) {
+  taosDumpMemoryLeak();
+}
+
 JNIEXPORT void JNICALL Java_com_taosdata_jdbc_TSDBJNIConnector_initImp(JNIEnv *env, jobject jobj, jstring jconfigDir) {
   if (jconfigDir != NULL) {
     const char *confDir = (*env)->GetStringUTFChars(env, jconfigDir, NULL);
@@ -207,10 +220,10 @@ JNIEXPORT jlong JNICALL Java_com_taosdata_jdbc_TSDBJNIConnector_connectImp(JNIEn
 
   ret = (jlong)taos_connect((char *)host, (char *)user, (char *)pass, (char *)dbname, jport);
   if (ret == 0) {
-    jniError("jobj:%p, taos:%p, connect to tdengine failed, host=%s, user=%s, dbname=%s, port=%d", jobj, (void *)ret,
+    jniError("jobj:%p, conn:%p, connect to database failed, host=%s, user=%s, dbname=%s, port=%d", jobj, (void *)ret,
              (char *)host, (char *)user, (char *)dbname, jport);
   } else {
-    jniTrace("jobj:%p, taos:%p, connect to tdengine succeed, host=%s, user=%s, dbname=%s, port=%d", jobj, (void *)ret,
+    jniTrace("jobj:%p, conn:%p, connect to database succeed, host=%s, user=%s, dbname=%s, port=%d", jobj, (void *)ret,
              (char *)host, (char *)user, (char *)dbname, jport);
   }
 
@@ -231,7 +244,7 @@ JNIEXPORT jint JNICALL Java_com_taosdata_jdbc_TSDBJNIConnector_executeQueryImp(J
   }
 
   if (jsql == NULL) {
-    jniError("jobj:%p, taos:%p, sql is null", jobj, tscon);
+    jniError("jobj:%p, conn:%p, sql is null", jobj, tscon);
     return JNI_SQL_NULL;
   }
 
@@ -249,7 +262,7 @@ JNIEXPORT jint JNICALL Java_com_taosdata_jdbc_TSDBJNIConnector_executeQueryImp(J
 
   int code = taos_query(tscon, dst);
   if (code != 0) {
-    jniError("jobj:%p, taos:%p, code:%d, msg:%s, sql:%s", jobj, tscon, code, taos_errstr(tscon), dst);
+    jniError("jobj:%p, conn:%p, code:%d, msg:%s, sql:%s", jobj, tscon, code, taos_errstr(tscon), dst);
     free(dst);
     return JNI_TDENGINE_ERROR;
   } else {
@@ -258,9 +271,9 @@ JNIEXPORT jint JNICALL Java_com_taosdata_jdbc_TSDBJNIConnector_executeQueryImp(J
 
     if (pSql->cmd.command == TSDB_SQL_INSERT) {
       affectRows = taos_affected_rows(tscon);
-      jniTrace("jobj:%p, taos:%p, code:%d, affect rows:%d, sql:%s", jobj, tscon, code, affectRows, dst);
+      jniTrace("jobj:%p, conn:%p, code:%d, affect rows:%d, sql:%s", jobj, tscon, code, affectRows, dst);
     } else {
-      jniTrace("jobj:%p, taos:%p, code:%d, sql:%s", jobj, tscon, code, dst);
+      jniTrace("jobj:%p, conn:%p, code:%d, sql:%s", jobj, tscon, code, dst);
     }
 
     free(dst);
@@ -290,15 +303,17 @@ JNIEXPORT jlong JNICALL Java_com_taosdata_jdbc_TSDBJNIConnector_getResultSetImp(
     return JNI_CONNECTION_NULL;
   }
 
-  int num_fields = taos_field_count(tscon);
+  jlong ret = 0;
-  if (num_fields != 0) {
+
-    jlong ret = (jlong)taos_use_result(tscon);
+  if (tscIsUpdateQuery(tscon)) {
-    jniTrace("jobj:%p, taos:%p, get resultset:%p", jobj, tscon, (void *)ret);
+    ret = 0;  // for update query, no result pointer
-    return ret;
+    jniTrace("jobj:%p, conn:%p, no result", jobj, tscon);
+  } else {
+    ret = (jlong) taos_use_result(tscon);
+    jniTrace("jobj:%p, conn:%p, get resultset:%p", jobj, tscon, (void *) ret);
   }
 
-  jniTrace("jobj:%p, taos:%p, no resultset", jobj, tscon);
+  return ret;
-  return 0;
 }
 
 JNIEXPORT jint JNICALL Java_com_taosdata_jdbc_TSDBJNIConnector_freeResultSetImp(JNIEnv *env, jobject jobj, jlong con,
@@ -310,12 +325,12 @@ JNIEXPORT jint JNICALL Java_com_taosdata_jdbc_TSDBJNIConnector_freeResultSetImp(
   }
 
   if ((void *)res == NULL) {
-    jniError("jobj:%p, taos:%p, resultset is null", jobj, tscon);
+    jniError("jobj:%p, conn:%p, resultset is null", jobj, tscon);
     return JNI_RESULT_SET_NULL;
   }
 
   taos_free_result((void *)res);
-  jniTrace("jobj:%p, taos:%p, free resultset:%p", jobj, tscon, (void *)res);
+  jniTrace("jobj:%p, conn:%p, free resultset:%p", jobj, tscon, (void *)res);
   return JNI_SUCCESS;
 }
 
@@ -329,7 +344,7 @@ JNIEXPORT jint JNICALL Java_com_taosdata_jdbc_TSDBJNIConnector_getAffectedRowsIm
 
   jint ret = taos_affected_rows(tscon);
 
-  jniTrace("jobj:%p, taos:%p, affect rows:%d", jobj, tscon, (void *)con, ret);
+  jniTrace("jobj:%p, conn:%p, affect rows:%d", jobj, tscon, (void *)con, ret);
 
   return ret;
 }
@@ -345,7 +360,7 @@ JNIEXPORT jint JNICALL Java_com_taosdata_jdbc_TSDBJNIConnector_getSchemaMetaData
 
   TAOS_RES *result = (TAOS_RES *)res;
   if (result == NULL) {
-    jniError("jobj:%p, taos:%p, resultset is null", jobj, tscon);
+    jniError("jobj:%p, conn:%p, resultset is null", jobj, tscon);
     return JNI_RESULT_SET_NULL;
   }
 
@@ -355,10 +370,10 @@ JNIEXPORT jint JNICALL Java_com_taosdata_jdbc_TSDBJNIConnector_getSchemaMetaData
   // jobject arrayListObj = (*env)->NewObject(env, g_arrayListClass, g_arrayListConstructFp, "");
 
   if (num_fields == 0) {
-    jniError("jobj:%p, taos:%p, resultset:%p, fields size is %d", jobj, tscon, res, num_fields);
+    jniError("jobj:%p, conn:%p, resultset:%p, fields size is %d", jobj, tscon, res, num_fields);
     return JNI_NUM_OF_FIELDS_0;
   } else {
-    jniTrace("jobj:%p, taos:%p, resultset:%p, fields size is %d", jobj, tscon, res, num_fields);
+    jniTrace("jobj:%p, conn:%p, resultset:%p, fields size is %d", jobj, tscon, res, num_fields);
     for (int i = 0; i < num_fields; ++i) {
       jobject metadataObj = (*env)->NewObject(env, g_metadataClass, g_metadataConstructFp);
       (*env)->SetIntField(env, metadataObj, g_metadataColtypeField, fields[i].type);
@@ -401,7 +416,7 @@ JNIEXPORT jint JNICALL Java_com_taosdata_jdbc_TSDBJNIConnector_fetchRowImp(JNIEn
 
   TAOS_RES *result = (TAOS_RES *)res;
   if (result == NULL) {
-    jniError("jobj:%p, taos:%p, resultset is null", jobj, tscon);
+    jniError("jobj:%p, conn:%p, resultset is null", jobj, tscon);
     return JNI_RESULT_SET_NULL;
   }
 
@@ -409,7 +424,7 @@ JNIEXPORT jint JNICALL Java_com_taosdata_jdbc_TSDBJNIConnector_fetchRowImp(JNIEn
   int         num_fields = taos_num_fields(result);
 
   if (num_fields == 0) {
-    jniError("jobj:%p, taos:%p, resultset:%p, fields size is %d", jobj, tscon, res, num_fields);
+    jniError("jobj:%p, conn:%p, resultset:%p, fields size is %d", jobj, tscon, res, num_fields);
     return JNI_NUM_OF_FIELDS_0;
   }
 
@@ -417,10 +432,10 @@ JNIEXPORT jint JNICALL Java_com_taosdata_jdbc_TSDBJNIConnector_fetchRowImp(JNIEn
   if (row == NULL) {
     int tserrno = taos_errno(tscon);
     if (tserrno == 0) {
-      jniTrace("jobj:%p, taos:%p, resultset:%p, fields size is %d, fetch row to the end", jobj, tscon, res, num_fields);
+      jniTrace("jobj:%p, conn:%p, resultset:%p, fields size is %d, fetch row to the end", jobj, tscon, res, num_fields);
       return JNI_FETCH_END;
     } else {
-      jniTrace("jobj:%p, taos:%p, interruptted query", jobj, tscon);
+      jniTrace("jobj:%p, conn:%p, interruptted query", jobj, tscon);
       return JNI_RESULT_SET_NULL;
     }
   }
@@ -484,7 +499,7 @@ JNIEXPORT jint JNICALL Java_com_taosdata_jdbc_TSDBJNIConnector_closeConnectionIm
     jniError("jobj:%p, connection is closed", jobj);
     return JNI_CONNECTION_NULL;
   } else {
-    jniTrace("jobj:%p, taos:%p, close connection success", jobj, tscon);
+    jniTrace("jobj:%p, conn:%p, close connection success", jobj, tscon);
     taos_close(tscon);
     return JNI_SUCCESS;
   }
@@ -639,7 +654,7 @@ JNIEXPORT jint JNICALL Java_com_taosdata_jdbc_TSDBJNIConnector_validateCreateTab
   }
 
   if (jsql == NULL) {
-    jniError("jobj:%p, taos:%p, sql is null", jobj, tscon);
+    jniError("jobj:%p, conn:%p, sql is null", jobj, tscon);
     return JNI_SQL_NULL;
   }
 
@@ -660,4 +675,4 @@ JNIEXPORT jint JNICALL Java_com_taosdata_jdbc_TSDBJNIConnector_validateCreateTab
 
 JNIEXPORT jstring JNICALL Java_com_taosdata_jdbc_TSDBJNIConnector_getTsCharset(JNIEnv *env, jobject jobj) {
   return (*env)->NewStringUTF(env, (const char *)tsCharset);
-}
+}

src/client/src/tscAst.c

@@ -13,12 +13,6 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <assert.h>
-#include <float.h>
-#include <math.h>
-#include <stdbool.h>
-#include <stdlib.h>
-
 #include "os.h"
 #include "taosmsg.h"
 #include "tast.h"
@@ -27,8 +21,12 @@
 #include "tschemautil.h"
 #include "tsdb.h"
 #include "tskiplist.h"
+#include "tsqldef.h"
 #include "tsqlfunction.h"
+#include "tstoken.h"
+#include "ttypes.h"
 #include "tutil.h"
+#include "tscSQLParser.h"
 
 /*
  *
@@ -43,13 +41,10 @@
  */
 
 static tSQLSyntaxNode *tSQLSyntaxNodeCreate(SSchema *pSchema, int32_t numOfCols, SSQLToken *pToken);
-static void tSQLSyntaxNodeDestroy(tSQLSyntaxNode *pNode);
+static void            tSQLSyntaxNodeDestroy(tSQLSyntaxNode *pNode, void (*fp)(void *));
 
 static tSQLSyntaxNode *createSyntaxTree(SSchema *pSchema, int32_t numOfCols, char *str, int32_t *i);
-static void destroySyntaxTree(tSQLSyntaxNode *);
+static void            destroySyntaxTree(tSQLSyntaxNode *);
-
-static void tSQLListTraversePrepare(tQueryInfo *colInfo, SSchema *pSchema, int32_t numOfCols, SSchema *pOneColSchema,
-                                    uint8_t optr, tVariant *val);
 
 static uint8_t isQueryOnPrimaryKey(const char *primaryColumnName, const tSQLSyntaxNode *pLeft,
                                    const tSQLSyntaxNode *pRight);
@@ -78,9 +73,14 @@ static void reviseBinaryExprIfNecessary(tSQLSyntaxNode **pLeft, tSQLSyntaxNode *
     }
   }
 
-  // switch left and left and right hand side in expr
+  /*
+   * for expressions that are suitable for switch principle,
+   * switch left and left and right hand side in expr if possible
+   */
   if ((*pLeft)->nodeType == TSQL_NODE_VALUE && (*pRight)->nodeType == TSQL_NODE_COL) {
-    SWAP(*pLeft, *pRight, tSQLSyntaxNode*);
+    if (*optr >= TSDB_RELATION_LARGE && *optr <= TSDB_RELATION_LARGE_EQUAL && *optr != TSDB_RELATION_EQUAL) {
+      SWAP(*pLeft, *pRight, tSQLSyntaxNode *);
+    }
 
     switch (*optr) {
       case TSDB_RELATION_LARGE:
@@ -119,15 +119,14 @@ static tSQLSyntaxNode *tSQLSyntaxNodeCreate(SSchema *pSchema, int32_t numOfCols,
         if (strncmp(pToken->z, pSchema[i].name, pToken->n) == 0 && pToken->n == len) break;
       } while (++i < numOfCols);
 
-      if (i == numOfCols) {
+      if (i == numOfCols) {  // column name is not valid, parse the expression failed
-        // column name is not valid, parse the expression failed
         return NULL;
       }
     }
 
     nodeSize += sizeof(SSchema);
 
-    pNode = malloc(nodeSize);
+    pNode = calloc(1, nodeSize);
     pNode->pSchema = (struct SSchema *)((char *)pNode + sizeof(tSQLSyntaxNode));
     pNode->nodeType = TSQL_NODE_COL;
 
@@ -144,7 +143,7 @@ static tSQLSyntaxNode *tSQLSyntaxNodeCreate(SSchema *pSchema, int32_t numOfCols,
 
   } else {
     nodeSize += sizeof(tVariant);
-    pNode = malloc(nodeSize);
+    pNode = calloc(1, nodeSize);
     pNode->pVal = (tVariant *)((char *)pNode + sizeof(tSQLSyntaxNode));
 
     toTSDBType(pToken->type);
@@ -202,12 +201,12 @@ static tSQLSyntaxNode *parseRemainStr(char *pstr, tSQLBinaryExpr *pExpr, SSchema
   tSQLSyntaxNode *pRight = createSyntaxTree(pSchema, numOfCols, pstr, i);
   if (pRight == NULL || (pRight->nodeType == TSQL_NODE_COL && pLeft->nodeType != TSQL_NODE_VALUE) ||
       (pLeft->nodeType == TSQL_NODE_VALUE && pRight->nodeType != TSQL_NODE_COL)) {
-    tSQLSyntaxNodeDestroy(pLeft);
+    tSQLSyntaxNodeDestroy(pLeft, NULL);
-    tSQLSyntaxNodeDestroy(pRight);
+    tSQLSyntaxNodeDestroy(pRight, NULL);
     return NULL;
   }
 
-  tSQLBinaryExpr *pNewExpr = (tSQLBinaryExpr *)malloc(sizeof(tSQLBinaryExpr));
+  tSQLBinaryExpr *pNewExpr = (tSQLBinaryExpr *)calloc(1, sizeof(tSQLBinaryExpr));
   uint8_t         k = optr;
   reviseBinaryExprIfNecessary(&pLeft, &pRight, &k);
   pNewExpr->pLeft = pLeft;
@@ -228,8 +227,7 @@ uint8_t isQueryOnPrimaryKey(const char *primaryColumnName, const tSQLSyntaxNode
     // if left node is the primary column,return true
     return (strcmp(primaryColumnName, pLeft->pSchema->name) == 0) ? 1 : 0;
   } else {
-    // if any children have query on primary key, their parents are also keep
+    // if any children have query on primary key, their parents are also keep this value
-    // this value
     return ((pLeft->nodeType == TSQL_NODE_EXPR && pLeft->pExpr->filterOnPrimaryKey == 1) ||
             (pRight->nodeType == TSQL_NODE_EXPR && pRight->pExpr->filterOnPrimaryKey == 1)) == true
                ? 1
@@ -238,9 +236,9 @@ uint8_t isQueryOnPrimaryKey(const char *primaryColumnName, const tSQLSyntaxNode
 }
 
 static tSQLSyntaxNode *createSyntaxTree(SSchema *pSchema, int32_t numOfCols, char *str, int32_t *i) {
-  SSQLToken t0 = {0};
+  SSQLToken t0;
 
-  tStrGetToken(str, i, &t0, false);
+  t0 = tStrGetToken(str, i, false, 0, NULL);
   if (t0.n == 0) {
     return NULL;
   }
@@ -259,11 +257,10 @@ static tSQLSyntaxNode *createSyntaxTree(SSchema *pSchema, int32_t numOfCols, cha
     return NULL;
   }
 
-  tStrGetToken(str, i, &t0, false);
+  t0 = tStrGetToken(str, i, false, 0, NULL);
   if (t0.n == 0 || t0.type == TK_RP) {
-    if (pLeft->nodeType != TSQL_NODE_EXPR) {
+    if (pLeft->nodeType != TSQL_NODE_EXPR) {  // if left is not the expr, it is not a legal expr
-      // if left is not the expr, it is not a legal expr
+      tSQLSyntaxNodeDestroy(pLeft, NULL);
-      tSQLSyntaxNodeDestroy(pLeft);
       return NULL;
     }
 
@@ -274,7 +271,7 @@ static tSQLSyntaxNode *createSyntaxTree(SSchema *pSchema, int32_t numOfCols, cha
   uint8_t optr = getBinaryExprOptr(&t0);
   if (optr <= 0) {
     pError("not support binary operator:%d", t0.type);
-    tSQLSyntaxNodeDestroy(pLeft);
+    tSQLSyntaxNodeDestroy(pLeft, NULL);
     return NULL;
   }
 
@@ -290,9 +287,9 @@ static tSQLSyntaxNode *createSyntaxTree(SSchema *pSchema, int32_t numOfCols, cha
      * if we do not get the information, in case of value of field presented first,
      * we revised the value after the binary expression is completed.
      */
-    tStrGetToken(str, i, &t0, true);
+    t0 = tStrGetToken(str, i, true, 0, NULL);
     if (t0.n == 0) {
-      tSQLSyntaxNodeDestroy(pLeft);  // illegal expression
+      tSQLSyntaxNodeDestroy(pLeft, NULL);  // illegal expression
       return NULL;
     }
 
@@ -304,12 +301,12 @@ static tSQLSyntaxNode *createSyntaxTree(SSchema *pSchema, int32_t numOfCols, cha
   }
 
   if (pRight == NULL) {
-    tSQLSyntaxNodeDestroy(pLeft);
+    tSQLSyntaxNodeDestroy(pLeft, NULL);
     return NULL;
   }
 
   /* create binary expr as the child of new parent node */
-  tSQLBinaryExpr *pBinExpr = (tSQLBinaryExpr *)malloc(sizeof(tSQLBinaryExpr));
+  tSQLBinaryExpr *pBinExpr = (tSQLBinaryExpr *)calloc(1, sizeof(tSQLBinaryExpr));
   reviseBinaryExprIfNecessary(&pLeft, &pRight, &optr);
 
   pBinExpr->filterOnPrimaryKey = isQueryOnPrimaryKey(pSchema[0].name, pLeft, pRight);
@@ -317,7 +314,7 @@ static tSQLSyntaxNode *createSyntaxTree(SSchema *pSchema, int32_t numOfCols, cha
   pBinExpr->pRight = pRight;
   pBinExpr->nSQLBinaryOptr = optr;
 
-  tStrGetToken(str, i, &t0, true);
+  t0 = tStrGetToken(str, i, true, 0, NULL);
 
   if (t0.n == 0 || t0.type == TK_RP) {
     tSQLSyntaxNode *pn = malloc(sizeof(tSQLSyntaxNode));
@@ -326,13 +323,13 @@ static tSQLSyntaxNode *createSyntaxTree(SSchema *pSchema, int32_t numOfCols, cha
     pn->colId = -1;
     return pn;
   } else {
-    int32_t optr = getBinaryExprOptr(&t0);
+    uint8_t localOptr = getBinaryExprOptr(&t0);
-    if (optr <= 0) {
+    if (localOptr <= 0) {
       pError("not support binary operator:%d", t0.type);
       return NULL;
     }
 
-    return parseRemainStr(str, pBinExpr, pSchema, optr, numOfCols, i);
+    return parseRemainStr(str, pBinExpr, pSchema, localOptr, numOfCols, i);
   }
 }
 
@@ -366,6 +363,7 @@ int32_t tSQLBinaryExprToStringImpl(tSQLSyntaxNode *pNode, char *dst, uint8_t typ
   return len;
 }
 
+// TODO REFACTOR WITH SQL PARSER
 static char *tSQLOptrToString(uint8_t optr, char *dst) {
   switch (optr) {
     case TSDB_RELATION_LESS: {
@@ -432,13 +430,15 @@ void tSQLBinaryExprToString(tSQLBinaryExpr *pExpr, char *dst, int32_t *len) {
   *len += tSQLBinaryExprToStringImpl(pExpr->pRight, start, pExpr->pRight->nodeType);
 }
 
-static void UNUSED_FUNC destroySyntaxTree(tSQLSyntaxNode *pNode) { tSQLSyntaxNodeDestroy(pNode); }
+static void UNUSED_FUNC destroySyntaxTree(tSQLSyntaxNode *pNode) { tSQLSyntaxNodeDestroy(pNode, NULL); }
 
-static void tSQLSyntaxNodeDestroy(tSQLSyntaxNode *pNode) {
+static void tSQLSyntaxNodeDestroy(tSQLSyntaxNode *pNode, void (*fp)(void *)) {
-  if (pNode == NULL) return;
+  if (pNode == NULL) {
+    return;
+  }
 
   if (pNode->nodeType == TSQL_NODE_EXPR) {
-    tSQLBinaryExprDestroy(&pNode->pExpr);
+    tSQLBinaryExprDestroy(&pNode->pExpr, fp);
   } else if (pNode->nodeType == TSQL_NODE_VALUE) {
     tVariantDestroy(pNode->pVal);
   }
@@ -446,139 +446,20 @@ static void tSQLSyntaxNodeDestroy(tSQLSyntaxNode *pNode) {
   free(pNode);
 }
 
-void tSQLBinaryExprDestroy(tSQLBinaryExpr **pExprs) {
+void tSQLBinaryExprDestroy(tSQLBinaryExpr **pExpr, void (*fp)(void *)) {
-  if (*pExprs == NULL) return;
+  if (*pExpr == NULL) {
-
+    return;
-  tSQLSyntaxNodeDestroy((*pExprs)->pLeft);
-  tSQLSyntaxNodeDestroy((*pExprs)->pRight);
-
-  free(*pExprs);
-  *pExprs = NULL;
-}
-
-static int32_t compareIntVal(const void *pLeft, const void *pRight) {
-  DEFAULT_COMP(GET_INT64_VAL(pLeft), GET_INT64_VAL(pRight));
-}
-
-static int32_t compareIntDoubleVal(const void *pLeft, const void *pRight) {
-  DEFAULT_COMP(GET_INT64_VAL(pLeft), GET_DOUBLE_VAL(pRight));
-}
-
-static int32_t compareDoubleVal(const void *pLeft, const void *pRight) {
-  DEFAULT_COMP(GET_DOUBLE_VAL(pLeft), GET_DOUBLE_VAL(pRight));
-}
-
-static int32_t compareDoubleIntVal(const void *pLeft, const void *pRight) {
-  double ret = (*(double *)pLeft) - (*(int64_t *)pRight);
-  if (fabs(ret) < DBL_EPSILON) {
-    return 0;
-  } else {
-    return ret > 0 ? 1 : -1;
-  }
-}
-
-static int32_t compareStrVal(const void *pLeft, const void *pRight) {
-  int32_t ret = strcmp(pLeft, pRight);
-  if (ret == 0) {
-    return 0;
-  } else {
-    return ret > 0 ? 1 : -1;
-  }
-}
-
-static int32_t compareWStrVal(const void *pLeft, const void *pRight) {
-  int32_t ret = wcscmp(pLeft, pRight);
-  if (ret == 0) {
-    return 0;
-  } else {
-    return ret > 0 ? 1 : -1;
-  }
-}
-
-static int32_t compareStrPatternComp(const void *pLeft, const void *pRight) {
-  SPatternCompareInfo pInfo = {'%', '_'};
-
-  const char *pattern = pRight;
-  const char *str = pLeft;
-
-  if (patternMatch(pattern, str, strlen(str), &pInfo) == TSDB_PATTERN_MATCH) {
-    return 0;
-  } else {
-    return 1;
-  }
-}
-
-static int32_t compareWStrPatternComp(const void *pLeft, const void *pRight) {
-  SPatternCompareInfo pInfo = {'%', '_'};
-
-  const wchar_t *pattern = pRight;
-  const wchar_t *str = pLeft;
-
-  if (WCSPatternMatch(pattern, str, wcslen(str), &pInfo) == TSDB_PATTERN_MATCH) {
-    return 0;
-  } else {
-    return 1;
-  }
-}
-
-static __compar_fn_t getFilterComparator(int32_t type, int32_t filterType, int32_t optr) {
-  __compar_fn_t comparator = NULL;
-
-  switch (type) {
-    case TSDB_DATA_TYPE_TINYINT:
-    case TSDB_DATA_TYPE_SMALLINT:
-    case TSDB_DATA_TYPE_INT:
-    case TSDB_DATA_TYPE_BIGINT:
-    case TSDB_DATA_TYPE_BOOL: {
-      if (filterType >= TSDB_DATA_TYPE_BOOL && filterType <= TSDB_DATA_TYPE_BIGINT) {
-        comparator = compareIntVal;
-      } else if (filterType >= TSDB_DATA_TYPE_FLOAT && filterType <= TSDB_DATA_TYPE_DOUBLE) {
-        comparator = compareIntDoubleVal;
-      }
-      break;
-    }
-
-    case TSDB_DATA_TYPE_FLOAT:
-    case TSDB_DATA_TYPE_DOUBLE: {
-      if (filterType >= TSDB_DATA_TYPE_BOOL && filterType <= TSDB_DATA_TYPE_BIGINT) {
-        comparator = compareDoubleIntVal;
-      } else if (filterType >= TSDB_DATA_TYPE_FLOAT && filterType <= TSDB_DATA_TYPE_DOUBLE) {
-        comparator = compareDoubleVal;
-      }
-      break;
-    }
-
-    case TSDB_DATA_TYPE_BINARY: {
-      assert(filterType == TSDB_DATA_TYPE_BINARY);
-
-      if (optr == TSDB_RELATION_LIKE) {
-        /* wildcard query using like operator */
-        comparator = compareStrPatternComp;
-      } else {
-        /* normal relational comparator */
-        comparator = compareStrVal;
-      }
-
-      break;
-    }
-
-    case TSDB_DATA_TYPE_NCHAR: {
-      assert(filterType == TSDB_DATA_TYPE_NCHAR);
-
-      if (optr == TSDB_RELATION_LIKE) {
-        comparator = compareWStrPatternComp;
-      } else {
-        comparator = compareWStrVal;
-      }
-
-      break;
-    }
-    default:
-      comparator = compareIntVal;
-      break;
   }
 
-  return comparator;
+  tSQLSyntaxNodeDestroy((*pExpr)->pLeft, fp);
+  tSQLSyntaxNodeDestroy((*pExpr)->pRight, fp);
+
+  if (fp != NULL) {
+    fp((*pExpr)->info);
+  }
+
+  free(*pExpr);
+  *pExpr = NULL;
 }
 
 static void setInitialValueForRangeQueryCondition(tSKipListQueryCond *q, int8_t type) {
@@ -619,106 +500,61 @@ static void setInitialValueForRangeQueryCondition(tSKipListQueryCond *q, int8_t
   }
 }
 
-static void tSQLDoFilterInitialResult(tSkipList *pSkipList, bool (*fp)(), tQueryInfo *colInfo,
+static void tSQLDoFilterInitialResult(tSkipList *pSkipList, bool (*fp)(), tQueryInfo *queryColInfo,
                                       tQueryResultset *result) {
-  // primary key, search according to skiplist
+  // primary key filter, search according to skiplist
-  if (colInfo->colIdx == 0 && colInfo->optr != TSDB_RELATION_LIKE) {
+  if (queryColInfo->colIdx == 0 && queryColInfo->optr != TSDB_RELATION_LIKE) {
     tSKipListQueryCond q;
-    setInitialValueForRangeQueryCondition(&q, colInfo->q.nType);
+    setInitialValueForRangeQueryCondition(&q, queryColInfo->q.nType);
 
-    switch (colInfo->optr) {
+    switch (queryColInfo->optr) {
       case TSDB_RELATION_EQUAL: {
         result->num =
-            tSkipListPointQuery(pSkipList, &colInfo->q, 1, INCLUDE_POINT_QUERY, (tSkipListNode ***)&result->pRes);
+            tSkipListPointQuery(pSkipList, &queryColInfo->q, 1, INCLUDE_POINT_QUERY, (tSkipListNode ***)&result->pRes);
         break;
       }
       case TSDB_RELATION_NOT_EQUAL: {
         result->num =
-            tSkipListPointQuery(pSkipList, &colInfo->q, 1, EXCLUDE_POINT_QUERY, (tSkipListNode ***)&result->pRes);
+            tSkipListPointQuery(pSkipList, &queryColInfo->q, 1, EXCLUDE_POINT_QUERY, (tSkipListNode ***)&result->pRes);
         break;
       }
       case TSDB_RELATION_LESS_EQUAL: {
-        tVariantAssign(&q.upperBnd, &colInfo->q);
+        tVariantAssign(&q.upperBnd, &queryColInfo->q);
-        q.upperBndRelOptr = colInfo->optr;
+        q.upperBndRelOptr = queryColInfo->optr;
         result->num = tSkipListQuery(pSkipList, &q, (tSkipListNode ***)&result->pRes);
         break;
       }
       case TSDB_RELATION_LESS: {
-        tVariantAssign(&q.upperBnd, &colInfo->q);
+        tVariantAssign(&q.upperBnd, &queryColInfo->q);
         result->num = tSkipListQuery(pSkipList, &q, (tSkipListNode ***)&result->pRes);
         break;
       }
       case TSDB_RELATION_LARGE: {
-        tVariantAssign(&q.lowerBnd, &colInfo->q);
+        tVariantAssign(&q.lowerBnd, &queryColInfo->q);
         result->num = tSkipListQuery(pSkipList, &q, (tSkipListNode ***)&result->pRes);
         break;
       }
       case TSDB_RELATION_LARGE_EQUAL: {
-        tVariantAssign(&q.lowerBnd, &colInfo->q);
+        tVariantAssign(&q.lowerBnd, &queryColInfo->q);
-        q.lowerBndRelOptr = colInfo->optr;
+        q.lowerBndRelOptr = queryColInfo->optr;
         result->num = tSkipListQuery(pSkipList, &q, (tSkipListNode ***)&result->pRes);
         break;
       }
       default:
-        pTrace("skiplist:%p, unsupport query operator:%d", pSkipList, colInfo->optr);
+        pTrace("skiplist:%p, unsupport query operator:%d", pSkipList, queryColInfo->optr);
     }
 
     tSkipListDestroyKey(&q.upperBnd);
     tSkipListDestroyKey(&q.lowerBnd);
   } else {
-    // brutal force search
+    /*
-    result->num = tSkipListIterateList(pSkipList, (tSkipListNode ***)&result->pRes, fp, colInfo);
+     * Brutal force scan the whole skiplit to find the appropriate result,
+     * since the filter is not applied to indexed column.
+     */
+    result->num = tSkipListIterateList(pSkipList, (tSkipListNode ***)&result->pRes, fp, queryColInfo);
   }
 }
 
-void tSQLListTraversePrepare(tQueryInfo *colInfo, SSchema *pSchema, int32_t numOfCols, SSchema *pOneColSchema,
-                             uint8_t optr, tVariant *val) {
-  int32_t i = 0, offset = 0;
-  if (strcasecmp(pOneColSchema->name, TSQL_TBNAME_L) == 0) {
-    i = -1;
-    offset = -1;
-  } else {
-    while (i < numOfCols) {
-      if (pSchema[i].bytes == pOneColSchema->bytes && pSchema[i].type == pOneColSchema->type &&
-          strcmp(pSchema[i].name, pOneColSchema->name) == 0) {
-        break;
-      } else {
-        offset += pSchema[i++].bytes;
-      }
-    }
-  }
-
-  colInfo->pSchema = pSchema;
-  colInfo->colIdx = i;
-  colInfo->optr = optr;
-  colInfo->offset = offset;
-  colInfo->comparator = getFilterComparator(pOneColSchema->type, val->nType, optr);
-
-  if (colInfo->pSchema[i].type != val->nType) {
-    /* convert the query string to be inline with the data type of the queried tags */
-    if (colInfo->pSchema[i].type == TSDB_DATA_TYPE_NCHAR && val->nType == TSDB_DATA_TYPE_BINARY) {
-      colInfo->q.nLen = TSDB_MAX_TAGS_LEN / TSDB_NCHAR_SIZE;
-
-      colInfo->q.wpz = calloc(1, TSDB_MAX_TAGS_LEN);
-      colInfo->q.nType = TSDB_DATA_TYPE_NCHAR;
-
-      taosMbsToUcs4(val->pz, val->nLen, (char *)colInfo->q.wpz, TSDB_MAX_TAGS_LEN);
-      colInfo->q.nLen = wcslen(colInfo->q.wpz) + 1;
-      return;
-    } else if (colInfo->pSchema[i].type == TSDB_DATA_TYPE_BINARY && val->nType == TSDB_DATA_TYPE_NCHAR) {
-      colInfo->q.nLen = TSDB_MAX_TAGS_LEN;
-      colInfo->q.pz = calloc(1, TSDB_MAX_TAGS_LEN);
-      colInfo->q.nType = TSDB_DATA_TYPE_BINARY;
-
-      taosUcs4ToMbs(val->wpz, val->nLen, colInfo->q.pz);
-      colInfo->q.nLen = strlen(colInfo->q.pz) + 1;
-      return;
-    }
-  }
-
-  tVariantAssign(&colInfo->q, val);
-}
-
 /*
  * qsort comparator
  * sort the result to ensure meters with the same gid is grouped together
@@ -731,7 +567,9 @@ static int32_t compareByAddr(const void *pLeft, const void *pRight) {
 }
 
 int32_t merge(tQueryResultset *pLeft, tQueryResultset *pRight, tQueryResultset *pFinalRes) {
-  pFinalRes->pRes = malloc(POINTER_BYTES * (pLeft->num + pRight->num));
+  assert(pFinalRes->pRes == 0);
+
+  pFinalRes->pRes = calloc((size_t)(pLeft->num + pRight->num), POINTER_BYTES);
   pFinalRes->num = 0;
 
   // sort according to address
@@ -742,6 +580,7 @@ int32_t merge(tQueryResultset *pLeft, tQueryResultset *pRight, tQueryResultset *
   qsort(pRightNodes, pRight->num, sizeof(pRight->pRes[0]), compareByAddr);
 
   int32_t i = 0, j = 0;
+
   // merge two sorted arrays in O(n) time
   while (i < pLeft->num && j < pRight->num) {
     int64_t ret = (int64_t)pLeftNodes[i] - (int64_t)pRightNodes[j];
@@ -770,7 +609,9 @@ int32_t merge(tQueryResultset *pLeft, tQueryResultset *pRight, tQueryResultset *
 int32_t intersect(tQueryResultset *pLeft, tQueryResultset *pRight, tQueryResultset *pFinalRes) {
   int64_t num = MIN(pLeft->num, pRight->num);
 
-  pFinalRes->pRes = malloc(POINTER_BYTES * num);
+  assert(pFinalRes->pRes == 0);
+
+  pFinalRes->pRes = calloc(num, POINTER_BYTES);
   pFinalRes->num = 0;
 
   // sort according to address
@@ -802,14 +643,14 @@ int32_t intersect(tQueryResultset *pLeft, tQueryResultset *pRight, tQueryResults
 /*
  *
  */
-void tSQLListTraverseOnResult(struct tSQLBinaryExpr *pExpr, bool (*fp)(tSkipListNode *, void *), tQueryInfo *colInfo,
+void tSQLListTraverseOnResult(struct tSQLBinaryExpr *pExpr, bool (*fp)(tSkipListNode *, void *),
-                              tQueryResultset *pResult) {
+                              tQueryResultset *      pResult) {
   assert(pExpr->pLeft->nodeType == TSQL_NODE_COL && pExpr->pRight->nodeType == TSQL_NODE_VALUE);
 
   // brutal force search
-  int32_t num = pResult->num;
+  int64_t num = pResult->num;
   for (int32_t i = 0, j = 0; i < pResult->num; ++i) {
-    if (fp == NULL || (fp != NULL && fp(pResult->pRes[i], colInfo) == true)) {
+    if (fp == NULL || (fp != NULL && fp(pResult->pRes[i], pExpr->info) == true)) {
       pResult->pRes[j++] = pResult->pRes[i];
     } else {
       num--;
@@ -819,32 +660,118 @@ void tSQLListTraverseOnResult(struct tSQLBinaryExpr *pExpr, bool (*fp)(tSkipList
   pResult->num = num;
 }
 
-// post-root order traverse syntax tree
+static bool filterItem(tSQLBinaryExpr *pExpr, const void *pItem, SBinaryFilterSupp *param) {
-void tSQLBinaryExprTraverse(tSQLBinaryExpr *pExprs, tSkipList *pSkipList, SSchema *pSchema, int32_t numOfCols,
+  tSQLSyntaxNode *pLeft = pExpr->pLeft;
-                            bool (*fp)(tSkipListNode *, void *), tQueryResultset *result) {
+  tSQLSyntaxNode *pRight = pExpr->pRight;
-  if (pExprs == NULL) return;
 
-  tSQLSyntaxNode *pLeft = pExprs->pLeft;
+  /*
-  tSQLSyntaxNode *pRight = pExprs->pRight;
+   * non-leaf nodes, recursively traverse the syntax tree in the post-root order
+   */
+  if (pLeft->nodeType == TSQL_NODE_EXPR && pRight->nodeType == TSQL_NODE_EXPR) {
+    if (pExpr->nSQLBinaryOptr == TSDB_RELATION_OR) {  // or
+      if (filterItem(pLeft->pExpr, pItem, param)) {
+        return true;
+      }
+
+      // left child does not satisfy the query condition, try right child
+      return filterItem(pRight->pExpr, pItem, param);
+    } else {  // and
+      if (!filterItem(pLeft->pExpr, pItem, param)) {
+        return false;
+      }
+
+      return filterItem(pRight->pExpr, pItem, param);
+    }
+  }
+
+  // handle the leaf node
+  assert(pLeft->nodeType == TSQL_NODE_COL && pRight->nodeType == TSQL_NODE_VALUE);
+  param->setupInfoFn(pExpr, param->pExtInfo);
+
+  return param->fp(pItem, pExpr->info);
+}
+
+/**
+ * Apply the filter expression on non-indexed tag columns to each element in the result list, which is generated
+ * by filtering on indexed tag column. So the whole result set only needs to be iterated once to generate
+ * result that is satisfied to the filter expression, no matter how the filter expression consisting of.
+ *
+ * @param pExpr     filter expression on non-indexed tag columns.
+ * @param pResult   results from filter on the indexed tag column, which is usually the first tag column
+ * @param pSchema   tag schemas
+ * @param fp        filter callback function
+ */
+static void tSQLBinaryTraverseOnResult(tSQLBinaryExpr *pExpr, tQueryResultset *pResult, SBinaryFilterSupp *param) {
+  int32_t n = 0;
+  for (int32_t i = 0; i < pResult->num; ++i) {
+    void *pItem = pResult->pRes[i];
+
+    if (filterItem(pExpr, pItem, param)) {
+      pResult->pRes[n++] = pResult->pRes[i];
+    }
+  }
+
+  pResult->num = n;
+}
+
+static void tSQLBinaryTraverseOnSkipList(tSQLBinaryExpr *pExpr, tQueryResultset *pResult, tSkipList *pSkipList,
+                                         SBinaryFilterSupp *param) {
+  int32_t           n = 0;
+  SSkipListIterator iter = {0};
+
+  int32_t ret = tSkipListIteratorReset(pSkipList, &iter);
+  assert(ret == 0);
+
+  pResult->pRes = calloc(pSkipList->nSize, POINTER_BYTES);
+
+  while (tSkipListIteratorNext(&iter)) {
+    tSkipListNode *pNode = tSkipListIteratorGet(&iter);
+    if (filterItem(pExpr, pNode, param)) {
+      pResult->pRes[n++] = pNode;
+    }
+  }
+
+  pResult->num = n;
+}
+
+// post-root order traverse syntax tree
+void tSQLBinaryExprTraverse(tSQLBinaryExpr *pExpr, tSkipList *pSkipList, tQueryResultset *result,
+                            SBinaryFilterSupp *param) {
+  if (pExpr == NULL) {
+    return;
+  }
+
+  tSQLSyntaxNode *pLeft = pExpr->pLeft;
+  tSQLSyntaxNode *pRight = pExpr->pRight;
 
   // recursive traverse left child branch
   if (pLeft->nodeType == TSQL_NODE_EXPR || pRight->nodeType == TSQL_NODE_EXPR) {
     uint8_t weight = pLeft->pExpr->filterOnPrimaryKey + pRight->pExpr->filterOnPrimaryKey;
 
     if (weight == 0 && result->num > 0 && pSkipList == NULL) {
-      /* base on the initial filter result to perform the secondary filter */
+      /**
-      tSQLBinaryExprTraverse(pLeft->pExpr, pSkipList, pSchema, numOfCols, fp, result);
+       * Perform the filter operation based on the initial filter result, which is obtained from filtering from index.
-      tSQLBinaryExprTraverse(pRight->pExpr, pSkipList, pSchema, numOfCols, fp, result);
+       * Since no index presented, the filter operation is done by scan all elements in the result set.
-    } else if (weight == 0 || weight == 2 || (weight == 1 && pExprs->nSQLBinaryOptr == TSDB_RELATION_OR)) {
+       *
+       * if the query is a high selectivity filter, only small portion of meters are retrieved.
+       */
+      tSQLBinaryTraverseOnResult(pExpr, result, param);
+    } else if (weight == 0) {
+      /**
+       * apply the hierarchical expression to every node in skiplist for find the qualified nodes
+       */
+      assert(result->num == 0);
+      tSQLBinaryTraverseOnSkipList(pExpr, result, pSkipList, param);
+    } else if (weight == 2 || (weight == 1 && pExpr->nSQLBinaryOptr == TSDB_RELATION_OR)) {
       tQueryResultset rLeft = {0};
       tQueryResultset rRight = {0};
 
-      tSQLBinaryExprTraverse(pLeft->pExpr, pSkipList, pSchema, numOfCols, fp, &rLeft);
+      tSQLBinaryExprTraverse(pLeft->pExpr, pSkipList, &rLeft, param);
-      tSQLBinaryExprTraverse(pRight->pExpr, pSkipList, pSchema, numOfCols, fp, &rRight);
+      tSQLBinaryExprTraverse(pRight->pExpr, pSkipList, &rRight, param);
 
-      if (pExprs->nSQLBinaryOptr == TSDB_RELATION_AND) {  // CROSS
+      if (pExpr->nSQLBinaryOptr == TSDB_RELATION_AND) {  // CROSS
         intersect(&rLeft, &rRight, result);
-      } else if (pExprs->nSQLBinaryOptr == TSDB_RELATION_OR) {  // or
+      } else if (pExpr->nSQLBinaryOptr == TSDB_RELATION_OR) {  // or
         merge(&rLeft, &rRight, result);
       } else {
         assert(false);
@@ -854,43 +781,44 @@ void tSQLBinaryExprTraverse(tSQLBinaryExpr *pExprs, tSkipList *pSkipList, SSchem
       free(rRight.pRes);
     } else {
       /*
-       * first, we filter results based on the skiplist index, which is initial filter stage,
+       * (weight == 1 && pExpr->nSQLBinaryOptr == TSDB_RELATION_AND) is handled here
+       *
+       * first, we filter results based on the skiplist index, which is the initial filter stage,
        * then, we conduct the secondary filter operation based on the result from the initial filter stage.
        */
-      if (pExprs->nSQLBinaryOptr == TSDB_RELATION_AND) {
+      assert(pExpr->nSQLBinaryOptr == TSDB_RELATION_AND);
-        tSQLBinaryExpr *pFirst = (pLeft->pExpr->filterOnPrimaryKey == 1) ? pLeft->pExpr : pRight->pExpr;
-        tSQLBinaryExpr *pSec = (pLeft->pExpr->filterOnPrimaryKey == 1) ? pRight->pExpr : pLeft->pExpr;
-        assert(pFirst != pSec && pFirst != NULL && pSec != NULL);
 
-        // we filter the result based on the skiplist index
+      tSQLBinaryExpr *pFirst = NULL;
-        tSQLBinaryExprTraverse(pFirst, pSkipList, pSchema, numOfCols, fp, result);
+      tSQLBinaryExpr *pSecond = NULL;
-
+      if (pLeft->pExpr->filterOnPrimaryKey == 1) {
-        /*
+        pFirst = pLeft->pExpr;
-         * recursively perform the filter operation based on the initial results,
+        pSecond = pRight->pExpr;
-         * So, we do not set the skiplist index as a parameter
-         */
-        tSQLBinaryExprTraverse(pSec, NULL, pSchema, numOfCols, fp, result);
       } else {
-        assert(false);
+        pFirst = pRight->pExpr;
+        pSecond = pLeft->pExpr;
       }
-    }
 
+      assert(pFirst != pSecond && pFirst != NULL && pSecond != NULL);
+
+      // we filter the result based on the skiplist index in the first place
+      tSQLBinaryExprTraverse(pFirst, pSkipList, result, param);
+
+      /*
+       * recursively perform the filter operation based on the initial results,
+       * So, we do not set the skiplist index as a parameter
+       */
+      tSQLBinaryExprTraverse(pSecond, NULL, result, param);
+    }
   } else {  // column project
     assert(pLeft->nodeType == TSQL_NODE_COL && pRight->nodeType == TSQL_NODE_VALUE);
-    tVariant *pCond = pRight->pVal;
-    SSchema * pTagSchema = pLeft->pSchema;
-
-    tQueryInfo queryColInfo = {0};
-    tSQLListTraversePrepare(&queryColInfo, pSchema, numOfCols, pTagSchema, pExprs->nSQLBinaryOptr, pCond);
 
+    param->setupInfoFn(pExpr, param->pExtInfo);
     if (pSkipList == NULL) {
-      tSQLListTraverseOnResult(pExprs, fp, &queryColInfo, result);
+      tSQLListTraverseOnResult(pExpr, param->fp, result);
     } else {
       assert(result->num == 0);
-      tSQLDoFilterInitialResult(pSkipList, fp, &queryColInfo, result);
+      tSQLDoFilterInitialResult(pSkipList, param->fp, pExpr->info, result);
     }
-
-    tVariantDestroy(&queryColInfo.q);
   }
 }
 
@@ -916,9 +844,11 @@ void tSQLBinaryExprCalcTraverse(tSQLBinaryExpr *pExprs, int32_t numOfRows, char
   }
 
   if (pLeft->nodeType == TSQL_NODE_EXPR) {
-    if (pRight->nodeType == TSQL_NODE_EXPR) {  // exprLeft + exprRight
+    if (pRight->nodeType == TSQL_NODE_EXPR) {
-                                               /* the type of returned value of one expression is always double float
+      /*
-                                                * precious */
+       * exprLeft + exprRight
+       * the type of returned value of one expression is always double float precious
+       */
       _bi_consumer_fn_t fp = tGetBiConsumerFn(TSDB_DATA_TYPE_DOUBLE, TSDB_DATA_TYPE_DOUBLE, pExprs->nSQLBinaryOptr);
       fp(pLeftOutput, pRightOutput, numOfRows, numOfRows, pOutput, order);
 
@@ -958,7 +888,7 @@ void tSQLBinaryExprCalcTraverse(tSQLBinaryExpr *pExprs, int32_t numOfRows, char
 
     } else if (pRight->nodeType == TSQL_NODE_COL) {  // 12 + columnRight
       // column data specified on right-hand-side
-      char *pRightInputData = getSourceDataBlock(param, pRight->pSchema->name, pRight->colId);
+      char *            pRightInputData = getSourceDataBlock(param, pRight->pSchema->name, pRight->colId);
       _bi_consumer_fn_t fp = tGetBiConsumerFn(pLeft->pVal->nType, pRight->pSchema->type, pExprs->nSQLBinaryOptr);
       fp(&pLeft->pVal->i64Key, pRightInputData, 1, numOfRows, pOutput, order);
 
@@ -994,4 +924,13 @@ void tSQLBinaryExprTrv(tSQLBinaryExpr *pExprs, int32_t *val, int16_t *ids) {
     ids[*val] = pRight->pSchema->colId;
     (*val) += 1;
   }
+}
+
+void tQueryResultClean(tQueryResultset *pRes) {
+  if (pRes == NULL) {
+    return;
+  }
+
+  tfree(pRes->pRes);
+  pRes->num = 0;
 }

src/client/src/tscAsync.c

@@ -13,8 +13,7 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <stdio.h>
+#include "os.h"
-#include <stdlib.h>
 
 #include "tlog.h"
 #include "trpc.h"
@@ -23,8 +22,9 @@
 #include "tscUtil.h"
 #include "tsclient.h"
 #include "tsocket.h"
-#include "tsql.h"
+#include "tscSQLParser.h"
 #include "tutil.h"
+#include "tnote.h"
 
 void tscProcessFetchRow(SSchedMsg *pMsg);
 void tscProcessAsyncRetrieve(void *param, TAOS_RES *tres, int numOfRows);
@@ -40,7 +40,8 @@ static void tscProcessAsyncRetrieveImpl(void *param, TAOS_RES *tres, int numOfRo
  */
 static void tscProcessAsyncFetchRowsProxy(void *param, TAOS_RES *tres, int numOfRows);
 
-void taos_query_a(TAOS *taos, char *sqlstr, void (*fp)(void *, TAOS_RES *, int), void *param) {
+// TODO return the correct error code to client in tscQueueAsyncError
+void taos_query_a(TAOS *taos, const char *sqlstr, void (*fp)(void *, TAOS_RES *, int), void *param) {
   STscObj *pObj = (STscObj *)taos;
   if (pObj == NULL || pObj->signature != pObj) {
     tscError("bug!!! pObj:%p", pObj);
@@ -56,14 +57,15 @@ void taos_query_a(TAOS *taos, char *sqlstr, void (*fp)(void *, TAOS_RES *, int),
     return;
   }
 
-  SSqlObj *pSql = (SSqlObj *)malloc(sizeof(SSqlObj));
+  taosNotePrintTsc(sqlstr);
+
+  SSqlObj *pSql = (SSqlObj *)calloc(1, sizeof(SSqlObj));
   if (pSql == NULL) {
     tscError("failed to malloc sqlObj");
     tscQueueAsyncError(fp, param);
     return;
   }
 
-  memset(pSql, 0, sizeof(SSqlObj));
   SSqlCmd *pCmd = &pSql->cmd;
   SSqlRes *pRes = &pSql->res;
 
@@ -72,13 +74,14 @@ void taos_query_a(TAOS *taos, char *sqlstr, void (*fp)(void *, TAOS_RES *, int),
   pSql->fp = fp;
   pSql->param = param;
 
-  if (tscAllocPayloadWithSize(pCmd, TSDB_DEFAULT_PAYLOAD_SIZE) != TSDB_CODE_SUCCESS) {
+  if (TSDB_CODE_SUCCESS != tscAllocPayload(pCmd, TSDB_DEFAULT_PAYLOAD_SIZE)) {
-    tscError("%p failed to alloc payload", pSql);
+    tscError("failed to malloc payload");
+    tfree(pSql);
     tscQueueAsyncError(fp, param);
-    free(pSql);
     return;
   }
 
+
   pSql->sqlstr = malloc(sqlLen + 1);
   if (pSql->sqlstr == NULL) {
     tscError("%p failed to malloc sql string buffer", pSql);
@@ -116,9 +119,9 @@ static void tscProcessAsyncFetchRowsProxy(void *param, TAOS_RES *tres, int numOf
   SSqlCmd *pCmd = &pSql->cmd;
 
   // sequentially retrieve data from remain vnodes first, query vnode specified by vnodeIdx
-  if (numOfRows == 0 && tscProjectionQueryOnMetric(pSql)) {
+  if (numOfRows == 0 && tscProjectionQueryOnMetric(pCmd)) {
     // vnode is denoted by vnodeIdx, continue to query vnode specified by vnodeIdx
-    assert(pCmd->vnodeIdx >= 1);
+    assert(pCmd->vnodeIdx >= 0);
 
     /* reach the maximum number of output rows, abort */
     if (pCmd->globalLimit > 0 && pRes->numOfTotal >= pCmd->globalLimit) {
@@ -128,14 +131,14 @@ static void tscProcessAsyncFetchRowsProxy(void *param, TAOS_RES *tres, int numOf
 
     /* update the limit value according to current retrieval results */
     pCmd->limit.limit = pCmd->globalLimit - pRes->numOfTotal;
+    pCmd->limit.offset = pRes->offset;
 
-    if ((++(pSql->cmd.vnodeIdx)) <= pCmd->pMetricMeta->numOfVnodes) {
+    if ((++(pCmd->vnodeIdx)) < tscGetMeterMetaInfo(pCmd, 0)->pMetricMeta->numOfVnodes) {
-      pCmd->command = TSDB_SQL_SELECT;  // reset flag to launch query first.
+      tscTrace("%p retrieve data from next vnode:%d", pSql, pCmd->vnodeIdx);
 
-      pRes->row = 0;
+      pSql->cmd.command = TSDB_SQL_SELECT;  // reset flag to launch query first.
-      pRes->numOfRows = 0;
-      pCmd->type = 0;
 
+      tscResetForNextRetrieve(pRes);
       pSql->fp = tscProcessAsyncRetrieveNextVnode;
       tscProcessSql(pSql);
       return;
@@ -213,14 +216,12 @@ void taos_fetch_rows_a(TAOS_RES *taosa, void (*fp)(void *, TAOS_RES *, int), voi
   pSql->fp = tscProcessAsyncFetchRowsProxy;
 
   pSql->param = param;
-
+  tscResetForNextRetrieve(pRes);
-  pRes->row = 0;
-  pRes->numOfRows = 0;
-  pCmd->type = 0;
 
   if (pCmd->command != TSDB_SQL_RETRIEVE_METRIC && pCmd->command < TSDB_SQL_LOCAL) {
     pCmd->command = (pCmd->command > TSDB_SQL_MGMT) ? TSDB_SQL_RETRIEVE : TSDB_SQL_FETCH;
   }
+
   tscProcessSql(pSql);
 }
 
@@ -246,9 +247,7 @@ void taos_fetch_row_a(TAOS_RES *taosa, void (*fp)(void *, TAOS_RES *, TAOS_ROW),
   pSql->param = param;
 
   if (pRes->row >= pRes->numOfRows) {
-    pRes->row = 0;
+    tscResetForNextRetrieve(pRes);
-    pRes->numOfRows = 0;
-    pCmd->type = 0;
     pSql->fp = tscProcessAsyncRetrieve;
     pCmd->command = (pCmd->command > TSDB_SQL_MGMT) ? TSDB_SQL_RETRIEVE : TSDB_SQL_FETCH;
     tscProcessSql(pSql);
@@ -269,7 +268,7 @@ void tscProcessAsyncRetrieve(void *param, TAOS_RES *tres, int numOfRows) {
 
   if (numOfRows == 0) {
     // sequentially retrieve data from remain vnodes.
-    if (tscProjectionQueryOnMetric(pSql)) {
+    if (tscProjectionQueryOnMetric(pCmd)) {
       /*
        * vnode is denoted by vnodeIdx, continue to query vnode specified by vnodeIdx till all vnode have been retrieved
        */
@@ -284,13 +283,10 @@ void tscProcessAsyncRetrieve(void *param, TAOS_RES *tres, int numOfRows) {
       /* update the limit value according to current retrieval results */
       pCmd->limit.limit = pCmd->globalLimit - pRes->numOfTotal;
 
-      if ((++pCmd->vnodeIdx) <= pCmd->pMetricMeta->numOfVnodes) {
+      if ((++pCmd->vnodeIdx) <= tscGetMeterMetaInfo(pCmd, 0)->pMetricMeta->numOfVnodes) {
-        pCmd->command = TSDB_SQL_SELECT;  // reset flag to launch query first.
+        pSql->cmd.command = TSDB_SQL_SELECT;  // reset flag to launch query first.
-
-        pRes->row = 0;
-        pRes->numOfRows = 0;
-        pCmd->type = 0;
 
+        tscResetForNextRetrieve(pRes);
         pSql->fp = tscProcessAsyncContinueRetrieve;
         tscProcessSql(pSql);
         return;
@@ -463,10 +459,10 @@ void tscMeterMetaCallBack(void *param, TAOS_RES *res, int code) {
       tsem_post(&pSql->rspSem);
     } else {
       tscTrace("%p renew meterMeta successfully, command:%d, code:%d, thandle:%p, retry:%d",
-               pSql, pSql->cmd.command, pSql->res.code, pSql->thandle, pSql->retry);
+          pSql, pSql->cmd.command, pSql->res.code, pSql->thandle, pSql->retry);
 
-      assert(pSql->cmd.pMeterMeta == NULL);
+      assert(tscGetMeterMetaInfo(&pSql->cmd, 0)->pMeterMeta == NULL);
-      tscGetMeterMeta(pSql, pSql->cmd.name);
+      tscGetMeterMeta(pSql, tscGetMeterMetaInfo(&pSql->cmd, 0)->name, 0);
 
       code = tscSendMsgToServer(pSql);
       if (code != 0) {
@@ -486,21 +482,23 @@ void tscMeterMetaCallBack(void *param, TAOS_RES *res, int code) {
 
   if (pSql->pStream == NULL) {
     // check if it is a sub-query of metric query first, if true, enter another routine
-    // todo refactor
+    if ((pSql->cmd.type & TSDB_QUERY_TYPE_STABLE_SUBQUERY) == TSDB_QUERY_TYPE_STABLE_SUBQUERY) {
-    if (pSql->fp == tscRetrieveDataRes || pSql->fp == tscRetrieveFromVnodeCallBack) {
+      SMeterMetaInfo* pMeterMetaInfo = tscGetMeterMetaInfo(pCmd, 0);
-      assert(pCmd->pMeterMeta->numOfTags != 0 && pCmd->vnodeIdx > 0 && pSql->param != NULL);
+      assert(pMeterMetaInfo->pMeterMeta->numOfTags != 0 && pCmd->vnodeIdx >= 0 && pSql->param != NULL);
 
       SRetrieveSupport *trs = (SRetrieveSupport *)pSql->param;
       SSqlObj *         pParObj = trs->pParentSqlObj;
-      assert(pParObj->signature == pParObj && trs->vnodeIdx == pCmd->vnodeIdx && pSql->cmd.pMeterMeta->numOfTags != 0);
+      assert(pParObj->signature == pParObj && trs->vnodeIdx == pCmd->vnodeIdx &&
+          pMeterMetaInfo->pMeterMeta->numOfTags != 0);
+
       tscTrace("%p get metricMeta during metric query successfully", pSql);
 
-      code = tscGetMeterMeta(pSql, pSql->cmd.name);
+      code = tscGetMeterMeta(pSql, tscGetMeterMetaInfo(&pSql->cmd, 0)->name, 0);
       pRes->code = code;
 
       if (code == TSDB_CODE_ACTION_IN_PROGRESS) return;
 
-      code = tscGetMetricMeta(pSql, pSql->cmd.name);
+      code = tscGetMetricMeta(pSql);
       pRes->code = code;
 
       if (code == TSDB_CODE_ACTION_IN_PROGRESS) return;
@@ -508,14 +506,17 @@ void tscMeterMetaCallBack(void *param, TAOS_RES *res, int code) {
       code = tsParseSql(pSql, pObj->acctId, pObj->db, false);
       if (code == TSDB_CODE_ACTION_IN_PROGRESS) return;
     }
+
   } else {  // stream computing
-    code = tscGetMeterMeta(pSql, pSql->cmd.name);
+    SMeterMetaInfo *pMeterMetaInfo = tscGetMeterMetaInfo(pCmd, 0);
+    code = tscGetMeterMeta(pSql, pMeterMetaInfo->name, 0);
     pRes->code = code;
 
     if (code == TSDB_CODE_ACTION_IN_PROGRESS) return;
 
-    if (code == TSDB_CODE_SUCCESS && UTIL_METER_IS_METRIC(pCmd)) {
+    pMeterMetaInfo = tscGetMeterMetaInfo(pCmd, 0);
-      code = tscGetMetricMeta(pSql, pSql->cmd.name);
+    if (code == TSDB_CODE_SUCCESS && UTIL_METER_IS_METRIC(pMeterMetaInfo)) {
+      code = tscGetMetricMeta(pSql);
       pRes->code = code;
 
       if (code == TSDB_CODE_ACTION_IN_PROGRESS) return;

src/client/src/tscCache.c

@@ -13,14 +13,7 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <assert.h>
+#include "os.h"
-#include <pthread.h>
-#include <semaphore.h>
-#include <signal.h>
-#include <stdint.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
 
 #include "tglobalcfg.h"
 #include "tlog.h"
@@ -32,7 +25,7 @@
 
 typedef struct _c_hash_t {
   uint32_t          ip;
-  short             port;
+  uint16_t          port;
   struct _c_hash_t *prev;
   struct _c_hash_t *next;
   void *            data;
@@ -52,14 +45,14 @@ typedef struct {
   void *pTimer;
 } SConnCache;
 
-int taosHashConn(void *handle, uint32_t ip, short port, char *user) {
+int taosHashConn(void *handle, uint32_t ip, uint16_t port, char *user) {
   SConnCache *pObj = (SConnCache *)handle;
   int         hash = 0;
   // size_t    user_len = strlen(user);
 
   hash = ip >> 16;
   hash += (unsigned short)(ip & 0xFFFF);
-  hash += (unsigned short)port;
+  hash += port;
   while (*user != '\0') {
     hash += *user;
     user++;
@@ -81,7 +74,7 @@ void taosRemoveExpiredNodes(SConnCache *pObj, SConnHash *pNode, int hash, uint64
     pNext = pNode->next;
     pObj->total--;
     pObj->count[hash]--;
-    tscTrace("%p ip:0x%x:%d:%d:%p removed, connections in cache:%d", pNode->data, pNode->ip, pNode->port, hash, pNode,
+    tscTrace("%p ip:0x%x:%hu:%d:%p removed, connections in cache:%d", pNode->data, pNode->ip, pNode->port, hash, pNode,
              pObj->count[hash]);
     taosMemPoolFree(pObj->connHashMemPool, (char *)pNode);
     pNode = pNext;
@@ -93,7 +86,7 @@ void taosRemoveExpiredNodes(SConnCache *pObj, SConnHash *pNode, int hash, uint64
     pObj->connHashList[hash] = NULL;
 }
 
-void *taosAddConnIntoCache(void *handle, void *data, uint32_t ip, short port, char *user) {
+void *taosAddConnIntoCache(void *handle, void *data, uint32_t ip, uint16_t port, char *user) {
   int         hash;
   SConnHash * pNode;
   SConnCache *pObj;
@@ -102,7 +95,12 @@ void *taosAddConnIntoCache(void *handle, void *data, uint32_t ip, short port, ch
 
   pObj = (SConnCache *)handle;
   if (pObj == NULL || pObj->maxSessions == 0) return NULL;
+
+#ifdef CLUSTER
+  if (data == NULL || ip == 0) {
+#else
   if (data == NULL) {
+#endif
     tscTrace("data:%p ip:%p:%d not valid, not added in cache", data, ip, port);
     return NULL;
   }
@@ -127,7 +125,7 @@ void *taosAddConnIntoCache(void *handle, void *data, uint32_t ip, short port, ch
 
   pthread_mutex_unlock(&pObj->mutex);
 
-  tscTrace("%p ip:0x%x:%d:%d:%p added, connections in cache:%d", data, ip, port, hash, pNode, pObj->count[hash]);
+  tscTrace("%p ip:0x%x:%hu:%d:%p added, connections in cache:%d", data, ip, port, hash, pNode, pObj->count[hash]);
 
   return pObj;
 }
@@ -154,7 +152,7 @@ void taosCleanConnCache(void *handle, void *tmrId) {
   taosTmrReset(taosCleanConnCache, pObj->keepTimer * 2, pObj, pObj->tmrCtrl, &pObj->pTimer);
 }
 
-void *taosGetConnFromCache(void *handle, uint32_t ip, short port, char *user) {
+void *taosGetConnFromCache(void *handle, uint32_t ip, uint16_t port, char *user) {
   int         hash;
   SConnHash * pNode;
   SConnCache *pObj;
@@ -203,7 +201,7 @@ void *taosGetConnFromCache(void *handle, uint32_t ip, short port, char *user) {
   pthread_mutex_unlock(&pObj->mutex);
 
   if (pData) {
-    tscTrace("%p ip:0x%x:%d:%d:%p retrieved, connections in cache:%d", pData, ip, port, hash, pNode, pObj->count[hash]);
+    tscTrace("%p ip:0x%x:%hu:%d:%p retrieved, connections in cache:%d", pData, ip, port, hash, pNode, pObj->count[hash]);
   }
 
   return pData;

src/client/src/tscLocal.c

@@ -13,11 +13,7 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <stdint.h>
+#include "os.h"
-#include <stdio.h>
-#include <stdlib.h>
-#include <taos.h>
-#include <tsclient.h>
 #include "taosmsg.h"
 
 #include "tcache.h"
@@ -30,7 +26,9 @@
 #include "tschemautil.h"
 #include "tsocket.h"
 
-static int32_t getToStringLength(char *pData, int32_t length, int32_t type) {
+static void tscSetLocalQueryResult(SSqlObj *pSql, const char *val, const char *columnName, size_t valueLength);
+
+static int32_t getToStringLength(const char *pData, int32_t length, int32_t type) {
   char buf[512] = {0};
 
   int32_t len = 0;
@@ -40,12 +38,30 @@ static int32_t getToStringLength(char *pData, int32_t length, int32_t type) {
       return length;
     case TSDB_DATA_TYPE_NCHAR:
       return length;
-    case TSDB_DATA_TYPE_DOUBLE:
+    case TSDB_DATA_TYPE_DOUBLE: {
+#ifdef _TD_ARM_32_
+      double dv = 0;
+      *(int64_t *)(&dv) = *(int64_t *)pData;
+      len = sprintf(buf, "%f", dv);
+#else
       len = sprintf(buf, "%lf", *(double *)pData);
-      break;
+#endif
-    case TSDB_DATA_TYPE_FLOAT:
+      if (strncasecmp("nan", buf, 3) == 0) {
+        len = 4;
+      }
+    } break;
+    case TSDB_DATA_TYPE_FLOAT: {
+#ifdef _TD_ARM_32_
+      float fv = 0;
+      *(int32_t *)(&fv) = *(int32_t *)pData;
+      len = sprintf(buf, "%f", fv);
+#else
       len = sprintf(buf, "%f", *(float *)pData);
-      break;
+#endif
+      if (strncasecmp("nan", buf, 3) == 0) {
+        len = 4;
+      }
+    } break;
     case TSDB_DATA_TYPE_TIMESTAMP:
     case TSDB_DATA_TYPE_BIGINT:
       len = sprintf(buf, "%lld", *(int64_t *)pData);
@@ -69,9 +85,10 @@ static int32_t getToStringLength(char *pData, int32_t length, int32_t type) {
  * length((uint64_t) 123456789011) > 12, greater than sizsof(uint64_t)
  */
 static int32_t tscMaxLengthOfTagsFields(SSqlObj *pSql) {
-  SMeterMeta *pMeta = pSql->cmd.pMeterMeta;
+  SMeterMeta *pMeta = tscGetMeterMetaInfo(&pSql->cmd, 0)->pMeterMeta;
 
-  if (pMeta->meterType != TSDB_METER_MTABLE) {
+  if (pMeta->meterType == TSDB_METER_METRIC || pMeta->meterType == TSDB_METER_OTABLE ||
+      pMeta->meterType == TSDB_METER_STABLE) {
     return 0;
   }
 
@@ -97,8 +114,9 @@ static int32_t tscSetValueToResObj(SSqlObj *pSql, int32_t rowLen) {
   SSqlRes *pRes = &pSql->res;
 
   // one column for each row
-  SSqlCmd *   pCmd = &pSql->cmd;
+  SSqlCmd *       pCmd = &pSql->cmd;
-  SMeterMeta *pMeta = pCmd->pMeterMeta;
+  SMeterMetaInfo *pMeterMetaInfo = tscGetMeterMetaInfo(pCmd, 0);
+  SMeterMeta *    pMeta = pMeterMetaInfo->pMeterMeta;
 
   /*
    * tagValueCnt is to denote the number of tags columns for meter, not metric. and is to show the column data.
@@ -109,7 +127,7 @@ static int32_t tscSetValueToResObj(SSqlObj *pSql, int32_t rowLen) {
   int32_t numOfRows = pMeta->numOfColumns;
   int32_t totalNumOfRows = numOfRows + pMeta->numOfTags;
 
-  if (UTIL_METER_IS_METRIC(pCmd)) {
+  if (UTIL_METER_IS_METRIC(pMeterMetaInfo)) {
     numOfRows = pMeta->numOfColumns + pMeta->numOfTags;
   }
 
@@ -141,7 +159,7 @@ static int32_t tscSetValueToResObj(SSqlObj *pSql, int32_t rowLen) {
     }
   }
 
-  if (UTIL_METER_IS_METRIC(pCmd)) {
+  if (UTIL_METER_IS_METRIC(pMeterMetaInfo)) {
     return 0;
   }
 
@@ -182,12 +200,24 @@ static int32_t tscSetValueToResObj(SSqlObj *pSql, int32_t rowLen) {
         case TSDB_DATA_TYPE_NCHAR:
           taosUcs4ToMbs(pTagValue, pSchema[i].bytes, target);
           break;
-        case TSDB_DATA_TYPE_FLOAT:
+        case TSDB_DATA_TYPE_FLOAT: {
+#ifdef _TD_ARM_32_
+          float fv = 0;
+          *(int32_t *)(&fv) = *(int32_t *)pTagValue;
+          sprintf(target, "%f", fv);
+#else
           sprintf(target, "%f", *(float *)pTagValue);
-          break;
+#endif
-        case TSDB_DATA_TYPE_DOUBLE:
+        } break;
+        case TSDB_DATA_TYPE_DOUBLE: {
+#ifdef _TD_ARM_32_
+          double dv = 0;
+          *(int64_t *)(&dv) = *(int64_t *)pTagValue;
+          sprintf(target, "%lf", dv);
+#else
           sprintf(target, "%lf", *(double *)pTagValue);
-          break;
+#endif
+        } break;
         case TSDB_DATA_TYPE_TINYINT:
           sprintf(target, "%d", *(int8_t *)pTagValue);
           break;
@@ -240,7 +270,7 @@ static int32_t tscBuildMeterSchemaResultFields(SSqlObj *pSql, int32_t numOfCols,
 }
 
 static int32_t tscProcessDescribeTable(SSqlObj *pSql) {
-  assert(pSql->cmd.pMeterMeta != NULL);
+  assert(tscGetMeterMetaInfo(&pSql->cmd, 0)->pMeterMeta != NULL);
 
   const int32_t NUM_OF_DESCRIBE_TABLE_COLUMNS = 4;
   const int32_t TYPE_COLUMN_LENGTH = 16;
@@ -261,15 +291,17 @@ static int32_t tscProcessDescribeTable(SSqlObj *pSql) {
 static int tscBuildMetricTagProjectionResult(SSqlObj *pSql) {
   // the result structure has been completed in sql parse, so we
   // only need to reorganize the results in the column format
-  SSqlCmd *pCmd = &pSql->cmd;
+  SSqlCmd *       pCmd = &pSql->cmd;
-  SSqlRes *pRes = &pSql->res;
+  SSqlRes *       pRes = &pSql->res;
+  SMeterMetaInfo *pMeterMetaInfo = tscGetMeterMetaInfo(pCmd, 0);
 
-  SMetricMeta *pMetricMeta = pCmd->pMetricMeta;
+  SMetricMeta *pMetricMeta = pMeterMetaInfo->pMetricMeta;
-  SSchema *    pSchema = tsGetTagSchema(pCmd->pMeterMeta);
+  SSchema *    pSchema = tsGetTagSchema(pMeterMetaInfo->pMeterMeta);
 
   int32_t vOffset[TSDB_MAX_COLUMNS] = {0};
-  for (int32_t f = 1; f < pCmd->numOfReqTags; ++f) {
+
-    int16_t tagColumnIndex = pCmd->tagColumnIndex[f - 1];
+  for (int32_t f = 1; f < pMeterMetaInfo->numOfTags; ++f) {
+    int16_t tagColumnIndex = pMeterMetaInfo->tagColumnIndex[f - 1];
     if (tagColumnIndex == -1) {
       vOffset[f] = vOffset[f - 1] + TSDB_METER_NAME_LEN;
     } else {
@@ -290,10 +322,10 @@ static int tscBuildMetricTagProjectionResult(SSqlObj *pSql) {
       SMeterSidExtInfo *pSidExt = tscGetMeterSidInfo(pSidList, j);
 
       for (int32_t k = 0; k < pCmd->fieldsInfo.numOfOutputCols; ++k) {
-        SColIndex *pColIndex = &tscSqlExprGet(pCmd, k)->colInfo;
+        SColIndexEx *pColIndex = &tscSqlExprGet(pCmd, k)->colInfo;
-        int32_t    offsetId = pColIndex->colIdx;
+        int16_t      offsetId = pColIndex->colIdx;
 
-        assert(pColIndex->isTag);
+        assert((pColIndex->flag & TSDB_COL_TAG) != 0);
 
         char *      val = pSidExt->tags + vOffset[offsetId];
         TAOS_FIELD *pField = tscFieldInfoGetField(pCmd, k);
@@ -312,7 +344,7 @@ static int tscBuildMetricTagSqlFunctionResult(SSqlObj *pSql) {
   SSqlCmd *pCmd = &pSql->cmd;
   SSqlRes *pRes = &pSql->res;
 
-  SMetricMeta *pMetricMeta = pCmd->pMetricMeta;
+  SMetricMeta *pMetricMeta = tscGetMeterMetaInfo(pCmd, 0)->pMetricMeta;
   int32_t      totalNumOfResults = 1;  // count function only produce one result
   int32_t      rowLen = tscGetResRowLength(pCmd);
 
@@ -323,7 +355,7 @@ static int tscBuildMetricTagSqlFunctionResult(SSqlObj *pSql) {
     for (int32_t k = 0; k < pCmd->fieldsInfo.numOfOutputCols; ++k) {
       SSqlExpr *pExpr = tscSqlExprGet(pCmd, i);
 
-      if (pExpr->colInfo.colIdx == -1 && pExpr->sqlFuncId == TSDB_FUNC_COUNT) {
+      if (pExpr->colInfo.colIdx == -1 && pExpr->functionId == TSDB_FUNC_COUNT) {
         TAOS_FIELD *pField = tscFieldInfoGetField(pCmd, k);
 
         memcpy(pRes->data + tscFieldInfoGetOffset(pCmd, i) * totalNumOfResults + pField->bytes * rowIdx,
@@ -342,7 +374,7 @@ static int tscBuildMetricTagSqlFunctionResult(SSqlObj *pSql) {
 static int tscProcessQueryTags(SSqlObj *pSql) {
   SSqlCmd *pCmd = &pSql->cmd;
 
-  SMeterMeta *pMeterMeta = pCmd->pMeterMeta;
+  SMeterMeta *pMeterMeta = tscGetMeterMetaInfo(pCmd, 0)->pMeterMeta;
   if (pMeterMeta == NULL || pMeterMeta->numOfTags == 0 || pMeterMeta->numOfColumns == 0) {
     strcpy(pCmd->payload, "invalid table");
     pSql->res.code = TSDB_CODE_INVALID_TABLE;
@@ -350,13 +382,75 @@ static int tscProcessQueryTags(SSqlObj *pSql) {
   }
 
   SSqlExpr *pExpr = tscSqlExprGet(pCmd, 0);
-  if (pExpr->sqlFuncId == TSDB_FUNC_COUNT) {
+  if (pExpr->functionId == TSDB_FUNC_COUNT) {
     return tscBuildMetricTagSqlFunctionResult(pSql);
   } else {
     return tscBuildMetricTagProjectionResult(pSql);
   }
 }
 
+static void tscProcessCurrentUser(SSqlObj *pSql) {
+  SSqlExpr* pExpr = tscSqlExprGet(&pSql->cmd, 0);
+  tscSetLocalQueryResult(pSql, pSql->pTscObj->user, pExpr->aliasName, TSDB_USER_LEN);
+}
+
+static void tscProcessCurrentDB(SSqlObj *pSql) {
+  char db[TSDB_DB_NAME_LEN + 1] = {0};
+  extractDBName(pSql->pTscObj->db, db);
+  
+  // no use db is invoked before.
+  if (strlen(db) == 0) {
+    setNull(db, TSDB_DATA_TYPE_BINARY, TSDB_DB_NAME_LEN);
+  }
+  
+  SSqlExpr* pExpr = tscSqlExprGet(&pSql->cmd, 0);
+  tscSetLocalQueryResult(pSql, db, pExpr->aliasName, TSDB_DB_NAME_LEN);
+}
+
+static void tscProcessServerVer(SSqlObj *pSql) {
+  const char* v = pSql->pTscObj->sversion;
+  
+  SSqlExpr* pExpr = tscSqlExprGet(&pSql->cmd, 0);
+  tscSetLocalQueryResult(pSql, v, pExpr->aliasName, tListLen(pSql->pTscObj->sversion));
+}
+
+static void tscProcessClientVer(SSqlObj *pSql) {
+  SSqlExpr* pExpr = tscSqlExprGet(&pSql->cmd, 0);
+  tscSetLocalQueryResult(pSql, version, pExpr->aliasName, strlen(version));
+}
+
+static void tscProcessServStatus(SSqlObj *pSql) {
+  STscObj* pObj = pSql->pTscObj;
+  
+  if (pObj->pHb != NULL) {
+    if (pObj->pHb->res.code == TSDB_CODE_NETWORK_UNAVAIL) {
+      pSql->res.code = TSDB_CODE_NETWORK_UNAVAIL;
+      return;
+    }
+  } else {
+    if (pSql->res.code == TSDB_CODE_NETWORK_UNAVAIL) {
+      return;
+    }
+  }
+  
+  SSqlExpr* pExpr = tscSqlExprGet(&pSql->cmd, 0);
+  tscSetLocalQueryResult(pSql, "1", pExpr->aliasName, 2);
+}
+
+void tscSetLocalQueryResult(SSqlObj *pSql, const char *val, const char *columnName, size_t valueLength) {
+  SSqlCmd *pCmd = &pSql->cmd;
+  SSqlRes *pRes = &pSql->res;
+
+  pCmd->numOfCols = 1;
+  pCmd->order.order = TSQL_SO_ASC;
+
+  tscFieldInfoSetValue(&pCmd->fieldsInfo, 0, TSDB_DATA_TYPE_BINARY, columnName, valueLength);
+  tscInitResObjForLocalQuery(pSql, 1, valueLength);
+
+  TAOS_FIELD *pField = tscFieldInfoGetField(pCmd, 0);
+  strncpy(pRes->data, val, pField->bytes);
+}
+
 int tscProcessLocalCmd(SSqlObj *pSql) {
   SSqlCmd *pCmd = &pSql->cmd;
 
@@ -367,16 +461,30 @@ int tscProcessLocalCmd(SSqlObj *pSql) {
   } else if (pCmd->command == TSDB_SQL_RETRIEVE_TAGS) {
     pSql->res.code = (uint8_t)tscProcessQueryTags(pSql);
   } else if (pCmd->command == TSDB_SQL_RETRIEVE_EMPTY_RESULT) {
-    pSql->res.qhandle = 0x1; // pass the qhandle check
+    /*
+     * set the qhandle to be 1 in order to pass the qhandle check, and to call partial release function to
+     * free allocated resources and remove the SqlObj from sql query linked list
+     */
+    pSql->res.qhandle = 0x1;
     pSql->res.numOfRows = 0;
   } else if (pCmd->command == TSDB_SQL_RESET_CACHE) {
     taosClearDataCache(tscCacheHandle);
+  } else if (pCmd->command == TSDB_SQL_SERV_VERSION) {
+    tscProcessServerVer(pSql);
+  } else if (pCmd->command == TSDB_SQL_CLI_VERSION) {
+    tscProcessClientVer(pSql);
+  } else if (pCmd->command == TSDB_SQL_CURRENT_USER) {
+    tscProcessCurrentUser(pSql);
+  } else if (pCmd->command == TSDB_SQL_CURRENT_DB) {
+    tscProcessCurrentDB(pSql);
+  } else if (pCmd->command == TSDB_SQL_SERV_STATUS) {
+    tscProcessServStatus(pSql);
   } else {
     pSql->res.code = TSDB_CODE_INVALID_SQL;
     tscError("%p not support command:%d", pSql, pCmd->command);
   }
 
-  //keep the code in local variable in order to avoid invalid read in case of async query
+  // keep the code in local variable in order to avoid invalid read in case of async query
   int32_t code = pSql->res.code;
 
   if (pSql->fp != NULL) {  // callback function

src/client/src/tscPrepare.c

@@ -0,0 +1,596 @@
+/*
+ * Copyright (c) 2019 TAOS Data, Inc. <jhtao@taosdata.com>
+ *
+ * This program is free software: you can use, redistribute, and/or modify
+ * it under the terms of the GNU Affero General Public License, version 3
+ * or later ("AGPL"), as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "taos.h"
+#include "tsclient.h"
+#include "tscSQLParser.h"
+#include "tscUtil.h"
+#include "ttimer.h"
+#include "taosmsg.h"
+#include "tstrbuild.h"
+
+
+int tsParseInsertSql(SSqlObj *pSql, char *sql, char *acct, char *db);
+int taos_query_imp(STscObj* pObj, SSqlObj* pSql);
+
+////////////////////////////////////////////////////////////////////////////////
+// functions for normal statement preparation
+
+typedef struct SNormalStmtPart {
+  bool  isParam;
+  uint32_t len;
+  char* str;
+} SNormalStmtPart;
+
+typedef struct SNormalStmt {
+  uint16_t         sizeParts;
+  uint16_t         numParts;
+  uint16_t         numParams;
+  char* sql;
+  SNormalStmtPart* parts;
+  tVariant*        params;
+} SNormalStmt;
+
+//typedef struct SInsertStmt {
+//
+//} SInsertStmt;
+
+typedef struct STscStmt {
+  bool isInsert;
+  STscObj* taos;
+  SSqlObj* pSql;
+  SNormalStmt normal;
+} STscStmt;
+
+
+static int normalStmtAddPart(SNormalStmt* stmt, bool isParam, char* str, uint32_t len) {
+  uint16_t size = stmt->numParts + 1;
+  if (size > stmt->sizeParts) {
+    size *= 2;
+    void* tmp = realloc(stmt->parts, sizeof(SNormalStmtPart) * size);
+    if (tmp == NULL) {
+      return TSDB_CODE_CLI_OUT_OF_MEMORY;
+    }
+    stmt->sizeParts = size;
+    stmt->parts = (SNormalStmtPart*)tmp;
+  }
+
+  stmt->parts[stmt->numParts].isParam = isParam;
+  stmt->parts[stmt->numParts].str = str;
+  stmt->parts[stmt->numParts].len = len;
+
+  ++stmt->numParts;
+  if (isParam) {
+    ++stmt->numParams;
+  }
+
+  return TSDB_CODE_SUCCESS;
+}
+
+static int normalStmtBindParam(STscStmt* stmt, TAOS_BIND* bind) {
+  SNormalStmt* normal = &stmt->normal;
+
+  for (uint16_t i = 0; i < normal->numParams; ++i) {
+    TAOS_BIND* tb = bind + i;
+    tVariant* var = normal->params + i;
+    tVariantDestroy(var);
+
+    var->nLen = 0;
+    if (tb->is_null != NULL && *(tb->is_null)) {
+      var->nType = TSDB_DATA_TYPE_NULL;
+      var->i64Key = 0;
+      continue;
+    }
+
+    var->nType = tb->buffer_type;
+    switch (tb->buffer_type) {
+      case TSDB_DATA_TYPE_NULL:
+        var->i64Key = 0;
+        break;
+
+      case TSDB_DATA_TYPE_BOOL:
+        var->i64Key = (*(int8_t*)tb->buffer) ? 1 : 0;
+        break;
+
+      case TSDB_DATA_TYPE_TINYINT:
+        var->i64Key = *(int8_t*)tb->buffer;
+        break;
+
+      case TSDB_DATA_TYPE_SMALLINT:
+        var->i64Key = *(int16_t*)tb->buffer;
+        break;
+
+      case TSDB_DATA_TYPE_INT:
+        var->i64Key = *(int32_t*)tb->buffer;
+        break;
+
+      case TSDB_DATA_TYPE_BIGINT:
+      case TSDB_DATA_TYPE_TIMESTAMP:
+        var->i64Key = *(int64_t*)tb->buffer;
+        break;
+
+      case TSDB_DATA_TYPE_FLOAT:
+        var->dKey = *(float*)tb->buffer;
+        break;
+
+      case TSDB_DATA_TYPE_DOUBLE:
+        var->dKey = *(double*)tb->buffer;
+        break;
+
+      case TSDB_DATA_TYPE_BINARY:
+      case TSDB_DATA_TYPE_NCHAR:
+        var->pz = (char*)malloc((*tb->length) + 1);
+        if (var->pz == NULL) {
+          return TSDB_CODE_CLI_OUT_OF_MEMORY;
+        }
+        memcpy(var->pz, tb->buffer, (*tb->length));
+        var->pz[*tb->length] = 0;
+        var->nLen = (int32_t)(*tb->length);
+        break;
+
+      default:
+        tscTrace("param %d: type mismatch or invalid", i);
+        return TSDB_CODE_INVALID_VALUE;
+    }
+  }
+  
+  return TSDB_CODE_SUCCESS;
+}
+
+
+static int normalStmtPrepare(STscStmt* stmt) {
+  SNormalStmt* normal = &stmt->normal;
+  char* sql = stmt->pSql->sqlstr;
+  uint32_t i = 0, start = 0;
+
+  while (sql[i] != 0) {
+    SSQLToken token = {0};
+    token.n = tSQLGetToken(sql + i, &token.type);
+
+    if (token.type == TK_QUESTION) {
+      sql[i] = 0;
+      if (i > start) {
+        int code = normalStmtAddPart(normal, false, sql + start, i - start);
+        if (code != TSDB_CODE_SUCCESS) {
+          return code;
+        }
+      }
+      int code = normalStmtAddPart(normal, true, NULL, 0);
+      if (code != TSDB_CODE_SUCCESS) {
+        return code;
+      }
+      start = i + token.n;
+    }
+
+    i += token.n;
+  }
+
+  if (i > start) {
+    int code = normalStmtAddPart(normal, false, sql + start, i - start);
+    if (code != TSDB_CODE_SUCCESS) {
+      return code;
+    }
+  }
+
+  if (normal->numParams > 0) {
+    normal->params = calloc(normal->numParams, sizeof(tVariant));
+    if (normal->params == NULL) {
+      return TSDB_CODE_CLI_OUT_OF_MEMORY;
+    }
+  }
+
+  return TSDB_CODE_SUCCESS;
+}
+
+static char* normalStmtBuildSql(STscStmt* stmt) {
+  SNormalStmt* normal = &stmt->normal;
+  SStringBuilder sb = {0};
+
+  if (taosStringBuilderSetJmp(&sb) != 0) {
+    taosStringBuilderDestroy(&sb);
+    return NULL;
+  }
+
+  taosStringBuilderEnsureCapacity(&sb, 4096);
+  uint32_t idxParam = 0;
+
+  for(uint16_t i = 0; i < normal->numParts; i++) {
+    SNormalStmtPart* part = normal->parts + i;
+    if (!part->isParam) {
+      taosStringBuilderAppendStringLen(&sb, part->str, part->len);
+      continue;
+    }
+
+    tVariant* var = normal->params + idxParam++;
+    switch (var->nType)
+    {
+    case TSDB_DATA_TYPE_NULL:
+      taosStringBuilderAppendNull(&sb);
+      break;
+    
+    case TSDB_DATA_TYPE_BOOL:
+    case TSDB_DATA_TYPE_TINYINT:
+    case TSDB_DATA_TYPE_SMALLINT:
+    case TSDB_DATA_TYPE_INT:
+    case TSDB_DATA_TYPE_BIGINT:
+      taosStringBuilderAppendInteger(&sb, var->i64Key);
+      break;
+
+    case TSDB_DATA_TYPE_FLOAT:
+    case TSDB_DATA_TYPE_DOUBLE:
+      taosStringBuilderAppendDouble(&sb, var->dKey);
+      break;
+
+    case TSDB_DATA_TYPE_BINARY:
+      taosStringBuilderAppendChar(&sb, '\'');
+      for (char* p = var->pz; *p != 0; ++p) {
+        if (*p == '\'' || *p == '"') {
+          taosStringBuilderAppendChar(&sb, '\\');
+        }
+        taosStringBuilderAppendChar(&sb, *p);
+      }
+      taosStringBuilderAppendChar(&sb, '\'');
+      break;
+
+    case TSDB_DATA_TYPE_NCHAR:
+      taosStringBuilderAppendChar(&sb, '\'');
+      taosStringBuilderAppend(&sb, var->wpz, var->nLen);
+      taosStringBuilderAppendChar(&sb, '\'');
+      break;
+
+    default:
+      assert(false);
+      break;
+    }
+  }
+
+  return taosStringBuilderGetResult(&sb, NULL);
+}
+
+////////////////////////////////////////////////////////////////////////////////
+// functions for insertion statement preparation
+
+static int doBindParam(char* data, SParamInfo* param, TAOS_BIND* bind) {
+  if (bind->is_null != NULL && *(bind->is_null)) {
+    setNull(data, param->type, param->bytes);
+    return TSDB_CODE_SUCCESS;
+  }
+
+  if (bind->buffer_type != param->type) {
+    return TSDB_CODE_INVALID_VALUE;
+  }
+
+  short size = 0;
+  switch(param->type) {
+    case TSDB_DATA_TYPE_BOOL:
+    case TSDB_DATA_TYPE_TINYINT:
+      size = 1;
+      break;
+
+    case TSDB_DATA_TYPE_SMALLINT:
+      size = 2;
+      break;
+
+    case TSDB_DATA_TYPE_INT:
+    case TSDB_DATA_TYPE_FLOAT:
+      size = 4;
+      break;
+
+    case TSDB_DATA_TYPE_BIGINT:
+    case TSDB_DATA_TYPE_DOUBLE:
+    case TSDB_DATA_TYPE_TIMESTAMP:
+      size = 8;
+      break;
+
+    case TSDB_DATA_TYPE_BINARY:
+      if ((*bind->length) > param->bytes) {
+        return TSDB_CODE_INVALID_VALUE;
+      }
+      size = (short)*bind->length;
+      break;
+    
+    case TSDB_DATA_TYPE_NCHAR:
+      if (!taosMbsToUcs4(bind->buffer, *bind->length, data + param->offset, param->bytes)) {
+        return TSDB_CODE_INVALID_VALUE;
+      }
+      return TSDB_CODE_SUCCESS;
+
+    default:
+      assert(false);
+      return TSDB_CODE_INVALID_VALUE;
+  }
+
+  memcpy(data + param->offset, bind->buffer, size);
+  return TSDB_CODE_SUCCESS;
+}
+
+static int insertStmtBindParam(STscStmt* stmt, TAOS_BIND* bind) {
+  SSqlCmd* pCmd = &stmt->pSql->cmd;
+
+  int32_t alloced = 1, binded = 0;
+  if (pCmd->batchSize > 0) {
+    alloced = (pCmd->batchSize + 1) / 2;
+    binded = pCmd->batchSize / 2;
+  }
+
+  for (int32_t i = 0; i < pCmd->pDataBlocks->nSize; ++i) {
+    STableDataBlocks* pBlock = pCmd->pDataBlocks->pData[i];
+    uint32_t          totalDataSize = pBlock->size - sizeof(SShellSubmitBlock);
+    uint32_t          dataSize = totalDataSize / alloced;
+    assert(dataSize * alloced == totalDataSize);
+
+    if (alloced == binded) {
+      totalDataSize += dataSize + sizeof(SShellSubmitBlock);
+      if (totalDataSize > pBlock->nAllocSize) {
+        const double factor = 1.5;
+        void* tmp = realloc(pBlock->pData, (uint32_t)(totalDataSize * factor));
+        if (tmp == NULL) {
+          return TSDB_CODE_CLI_OUT_OF_MEMORY;
+        }
+        pBlock->pData = (char*)tmp;
+        pBlock->nAllocSize = (uint32_t)(totalDataSize * factor);
+      }
+    }
+
+    char* data = pBlock->pData + sizeof(SShellSubmitBlock) + dataSize * binded;
+    for (uint32_t j = 0; j < pBlock->numOfParams; ++j) {
+      SParamInfo* param = pBlock->params + j;
+      int code = doBindParam(data, param, bind + param->idx);
+      if (code != TSDB_CODE_SUCCESS) {
+        tscTrace("param %d: type mismatch or invalid", param->idx);
+        return code;
+      }
+    }
+  }
+
+  // actual work of all data blocks is done, update block size and numOfRows.
+  // note we don't do this block by block during the binding process, because 
+  // we cannot recover if something goes wrong.
+  pCmd->batchSize = binded * 2 + 1;
+
+  if (binded < alloced) {
+    return TSDB_CODE_SUCCESS;
+  }
+
+  for (int32_t i = 0; i < pCmd->pDataBlocks->nSize; ++i) {
+    STableDataBlocks* pBlock = pCmd->pDataBlocks->pData[i];
+
+    uint32_t totalDataSize = pBlock->size - sizeof(SShellSubmitBlock);
+    pBlock->size += totalDataSize / alloced;
+
+    SShellSubmitBlock* pSubmit = (SShellSubmitBlock*)pBlock->pData;
+    pSubmit->numOfRows += pSubmit->numOfRows / alloced;
+  }
+
+  return TSDB_CODE_SUCCESS;
+}
+
+static int insertStmtAddBatch(STscStmt* stmt) {
+  SSqlCmd* pCmd = &stmt->pSql->cmd;
+  if ((pCmd->batchSize % 2) == 1) {
+    ++pCmd->batchSize;
+  }
+  return TSDB_CODE_SUCCESS;
+}
+
+static int insertStmtPrepare(STscStmt* stmt) {
+  STscObj* taos = stmt->taos;
+  SSqlObj *pSql = stmt->pSql;
+  pSql->cmd.numOfParams = 0;
+  pSql->cmd.batchSize = 0;
+
+  return tsParseInsertSql(pSql, pSql->sqlstr, taos->acctId, taos->db);
+}
+
+static int insertStmtReset(STscStmt* pStmt) {
+  SSqlCmd* pCmd = &pStmt->pSql->cmd;
+  if (pCmd->batchSize > 2) {
+    int32_t alloced = (pCmd->batchSize + 1) / 2;
+    for (int32_t i = 0; i < pCmd->pDataBlocks->nSize; ++i) {
+      STableDataBlocks* pBlock = pCmd->pDataBlocks->pData[i];
+
+      uint32_t totalDataSize = pBlock->size - sizeof(SShellSubmitBlock);
+      pBlock->size = sizeof(SShellSubmitBlock) + totalDataSize / alloced;
+
+      SShellSubmitBlock* pSubmit = (SShellSubmitBlock*)pBlock->pData;
+      pSubmit->numOfRows = pSubmit->numOfRows / alloced;
+    }
+  }
+  pCmd->batchSize = 0;
+  pCmd->vnodeIdx = 0;
+  return TSDB_CODE_SUCCESS;
+}
+
+static int insertStmtExecute(STscStmt* stmt) {
+  SSqlCmd* pCmd = &stmt->pSql->cmd;
+  if (pCmd->batchSize == 0) {
+    return TSDB_CODE_INVALID_VALUE;
+  }
+  if ((pCmd->batchSize % 2) == 1) {
+    ++pCmd->batchSize;
+  }
+
+  if (pCmd->pDataBlocks->nSize > 0) {
+    // merge according to vgid
+    int code = tscMergeTableDataBlocks(stmt->pSql, pCmd->pDataBlocks);
+    if (code != TSDB_CODE_SUCCESS) {
+      return code;
+    }
+
+    STableDataBlocks *pDataBlock = pCmd->pDataBlocks->pData[0];
+    code = tscCopyDataBlockToPayload(stmt->pSql, pDataBlock);
+    if (code != TSDB_CODE_SUCCESS) {
+      return code;
+    }
+
+    // set the next sent data vnode index in data block arraylist
+    pCmd->vnodeIdx = 1;
+  } else {
+    pCmd->pDataBlocks = tscDestroyBlockArrayList(pCmd->pDataBlocks);
+  }
+
+  SSqlObj *pSql = stmt->pSql;
+  SSqlRes *pRes = &pSql->res;
+  pRes->numOfRows = 0;
+  pRes->numOfTotal = 0;
+  pRes->qhandle = 0;
+  pSql->thandle = NULL;
+
+  tscDoQuery(pSql);
+
+  // tscTrace("%p SQL result:%d, %s pObj:%p", pSql, pRes->code, taos_errstr(taos), pObj);
+  if (pRes->code != TSDB_CODE_SUCCESS) {
+    tscFreeSqlObjPartial(pSql);
+  }
+
+  return pRes->code;
+}
+
+////////////////////////////////////////////////////////////////////////////////
+// interface functions
+
+TAOS_STMT* taos_stmt_init(TAOS* taos) {
+  STscObj* pObj = (STscObj*)taos;
+  if (pObj == NULL || pObj->signature != pObj) {
+    globalCode = TSDB_CODE_DISCONNECTED;
+    tscError("connection disconnected");
+    return NULL;
+  }
+
+  STscStmt* pStmt = calloc(1, sizeof(STscStmt));
+  if (pStmt == NULL) {
+    globalCode = TSDB_CODE_CLI_OUT_OF_MEMORY;
+    tscError("failed to allocate memory for statement");
+    return NULL;
+  }
+
+  SSqlObj* pSql = calloc(1, sizeof(SSqlObj));
+  if (pSql == NULL) {
+    free(pStmt);
+    globalCode = TSDB_CODE_CLI_OUT_OF_MEMORY;
+    tscError("failed to allocate memory for statement");
+    return NULL;
+  }
+
+  tsem_init(&pSql->rspSem, 0, 0);
+  tsem_init(&pSql->emptyRspSem, 0, 1);
+  pSql->signature = pSql;
+  pSql->pTscObj = pObj;
+
+  pStmt->pSql = pSql;
+  return pStmt;
+}
+
+int taos_stmt_prepare(TAOS_STMT* stmt, const char* sql, unsigned long length) {
+  STscStmt* pStmt = (STscStmt*)stmt;
+  if (length == 0) {
+    length = strlen(sql);
+  }
+  char* sqlstr = (char*)malloc(length + 1);
+  if (sqlstr == NULL) {
+    tscError("failed to malloc sql string buffer");
+    return TSDB_CODE_CLI_OUT_OF_MEMORY;
+  }
+  memcpy(sqlstr, sql, length);
+  sqlstr[length] = 0;
+  strtolower(sqlstr, sqlstr);
+
+  pStmt->pSql->sqlstr = sqlstr;
+  if (tscIsInsertOrImportData(sqlstr)) {
+    pStmt->isInsert = true;
+    return insertStmtPrepare(pStmt);
+  }
+
+  pStmt->isInsert = false;
+  return normalStmtPrepare(pStmt);
+}
+
+int taos_stmt_close(TAOS_STMT* stmt) {
+  STscStmt* pStmt = (STscStmt*)stmt;
+  if (!pStmt->isInsert) {
+    SNormalStmt* normal = &pStmt->normal;
+    if (normal->params != NULL) {
+      for (uint16_t i = 0; i < normal->numParams; i++) {
+        tVariantDestroy(normal->params + i);
+      }
+      free(normal->params);
+    }
+    free(normal->parts);
+    free(normal->sql);
+  }
+
+  tscFreeSqlObj(pStmt->pSql);
+  free(pStmt);
+  return TSDB_CODE_SUCCESS;
+}
+
+int taos_stmt_bind_param(TAOS_STMT* stmt, TAOS_BIND* bind) {
+  STscStmt* pStmt = (STscStmt*)stmt;
+  if (pStmt->isInsert) {
+    return insertStmtBindParam(pStmt, bind);
+  }
+  return normalStmtBindParam(pStmt, bind);
+}
+
+int taos_stmt_add_batch(TAOS_STMT* stmt) {
+  STscStmt* pStmt = (STscStmt*)stmt;
+  if (pStmt->isInsert) {
+    return insertStmtAddBatch(pStmt);
+  }
+  return TSDB_CODE_OPS_NOT_SUPPORT;
+}
+
+int taos_stmt_reset(TAOS_STMT* stmt) {
+  STscStmt* pStmt = (STscStmt*)stmt;
+  if (pStmt->isInsert) {
+    return insertStmtReset(pStmt);
+  }
+  return TSDB_CODE_SUCCESS;
+}
+
+int taos_stmt_execute(TAOS_STMT* stmt) {
+  int ret = 0;
+  STscStmt* pStmt = (STscStmt*)stmt;
+  if (pStmt->isInsert) {
+    ret = insertStmtExecute(pStmt);
+  } else {
+    char* sql = normalStmtBuildSql(pStmt);
+    if (sql == NULL) {
+      ret = TSDB_CODE_CLI_OUT_OF_MEMORY;
+    } else {
+      tfree(pStmt->pSql->sqlstr);
+      pStmt->pSql->sqlstr = sql;
+      ret = taos_query_imp(pStmt->taos, pStmt->pSql);
+    }
+  }
+  return ret;
+}
+
+TAOS_RES *taos_stmt_use_result(TAOS_STMT* stmt) {
+  if (stmt == NULL) {
+    tscError("statement is invalid.");
+    return NULL;
+  }
+
+  STscStmt* pStmt = (STscStmt*)stmt;
+  if (pStmt->pSql == NULL) {
+    tscError("result has been used already.");
+    return NULL;
+  }
+
+  TAOS_RES* result = pStmt->pSql;
+  pStmt->pSql = NULL;
+  return result;
+}

src/client/src/tscProfile.c

@@ -13,9 +13,6 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <stdio.h>
-#include <stdlib.h>
-
 #include "os.h"
 #include "tlog.h"
 #include "tsclient.h"
@@ -23,6 +20,27 @@
 #include "ttimer.h"
 #include "tutil.h"
 
+void  tscSaveSlowQueryFp(void *handle, void *tmrId);
+void *tscSlowQueryConn = NULL;
+bool  tscSlowQueryConnInitialized = false;
+TAOS *taos_connect_a(char *ip, char *user, char *pass, char *db, uint16_t port, void (*fp)(void *, TAOS_RES *, int),
+                     void *param, void **taos);
+
+void tscInitConnCb(void *param, TAOS_RES *result, int code) {
+  char *sql = param;
+  if (code < 0) {
+    tscError("taos:%p, slow query connect failed, code:%d", tscSlowQueryConn, code);
+    taos_close(tscSlowQueryConn);
+    tscSlowQueryConn = NULL;
+    tscSlowQueryConnInitialized = false;
+    free(sql);
+  } else {
+    tscTrace("taos:%p, slow query connect success, code:%d", tscSlowQueryConn, code);
+    tscSlowQueryConnInitialized = true;
+    tscSaveSlowQueryFp(sql, NULL);
+  }
+}
+
 void tscAddIntoSqlList(SSqlObj *pSql) {
   static uint32_t queryId = 1;
 
@@ -47,33 +65,35 @@ void tscAddIntoSqlList(SSqlObj *pSql) {
 
 void tscSaveSlowQueryFpCb(void *param, TAOS_RES *result, int code) {
   if (code < 0) {
-    tscError("failed to save slowquery, code:%d", code);
+    tscError("failed to save slow query, code:%d", code);
+  } else {
+    tscTrace("success to save slow query, code:%d", code);
   }
 }
 
 void tscSaveSlowQueryFp(void *handle, void *tmrId) {
   char *sql = handle;
 
-  static void *taos = NULL;
+  if (!tscSlowQueryConnInitialized) {
-  if (taos == NULL) {
+    if (tscSlowQueryConn == NULL) {
-    taos = taos_connect(NULL, "monitor", tsInternalPass, NULL, 0);
+      tscTrace("start to init slow query connect");
-    if (taos == NULL) {
+      taos_connect_a(NULL, "monitor", tsInternalPass, "", 0, tscInitConnCb, sql, &tscSlowQueryConn);
-      tscError("failed to save slow query, can't connect to server");
+    } else {
+      tscError("taos:%p, slow query connect is already initialized", tscSlowQueryConn);
       free(sql);
-      return;
     }
+  } else {
+    tscTrace("taos:%p, save slow query:%s", tscSlowQueryConn, sql);
+    taos_query_a(tscSlowQueryConn, sql, tscSaveSlowQueryFpCb, NULL);
+    free(sql);
   }
-
-  tscTrace("save slow query:sql", sql);
-  taos_query_a(taos, sql, tscSaveSlowQueryFpCb, NULL);
-  free(sql);
 }
 
 void tscSaveSlowQuery(SSqlObj *pSql) {
   const static int64_t SLOW_QUERY_INTERVAL = 3000000L;
   if (pSql->res.useconds < SLOW_QUERY_INTERVAL) return;
 
-  tscTrace("%p query time:%ld sql:%s", pSql, pSql->res.useconds, pSql->sqlstr);
+  tscTrace("%p query time:%lld sql:%s", pSql, pSql->res.useconds, pSql->sqlstr);
 
   char *sql = malloc(200);
   int   len = snprintf(sql, 200, "insert into %s.slowquery values(now, '%s', %lld, %lld, '", tsMonitorDbName,

src/client/src/tscSQLParserImpl.c

@@ -13,20 +13,11 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <stdio.h>
-#include <stdlib.h>
-
-#include <stdbool.h>
-#include <stdint.h>
-#include <string.h>
-
-#include <assert.h>
-#include <errno.h>
-#include <stdarg.h>
-
 #include "os.h"
+#include "taosmsg.h"
 #include "tglobalcfg.h"
-#include "tsql.h"
+#include "tlog.h"
+#include "tscSQLParser.h"
 #include "tstoken.h"
 #include "ttime.h"
 #include "tutil.h"
@@ -119,31 +110,29 @@ void tSQLExprListDestroy(tSQLExprList *pList) {
   free(pList);
 }
 
-tSQLExpr *tSQLExprIdValueCreate(SSQLToken *pToken, int32_t optrType) {
+tSQLExpr *tSQLExprIdValueCreate(SSQLToken *pAliasToken, int32_t optrType) {
   tSQLExpr *nodePtr = calloc(1, sizeof(tSQLExpr));
 
   if (optrType == TK_INTEGER || optrType == TK_STRING || optrType == TK_FLOAT || optrType == TK_BOOL) {
-    toTSDBType(pToken->type);
+    toTSDBType(pAliasToken->type);
 
-    tVariantCreate(&nodePtr->val, pToken);
+    tVariantCreate(&nodePtr->val, pAliasToken);
     nodePtr->nSQLOptr = optrType;
   } else if (optrType == TK_NOW) {
     // default use microsecond
     nodePtr->val.i64Key = taosGetTimestamp(TSDB_TIME_PRECISION_MICRO);
     nodePtr->val.nType = TSDB_DATA_TYPE_BIGINT;
-    nodePtr->nSQLOptr = TK_TIMESTAMP;
+    nodePtr->nSQLOptr = TK_TIMESTAMP;  // TK_TIMESTAMP used to denote the time value is in microsecond
-    // TK_TIMESTAMP used to denote the time value is in microsecond
   } else if (optrType == TK_VARIABLE) {
-    int32_t ret = getTimestampInUsFromStr(pToken->z, pToken->n, &nodePtr->val.i64Key);
+    int32_t ret = getTimestampInUsFromStr(pAliasToken->z, pAliasToken->n, &nodePtr->val.i64Key);
     UNUSED(ret);
 
     nodePtr->val.nType = TSDB_DATA_TYPE_BIGINT;
     nodePtr->nSQLOptr = TK_TIMESTAMP;
-  } else {  // must be field id if not numbers
+  } else {  // it must be the column name (tk_id) if it is not the number
-    assert(optrType == TK_ALL || optrType == TK_ID);
+    assert(optrType == TK_ID || optrType == TK_ALL);
-
+    if (pAliasToken != NULL) {
-    if (pToken != NULL) { // it must be the column name (tk_id)
+      nodePtr->colInfo = *pAliasToken;
-      nodePtr->colInfo = *pToken;
     }
 
     nodePtr->nSQLOptr = optrType;
@@ -273,11 +262,10 @@ tSQLExpr *tSQLExprCreate(tSQLExpr *pLeft, tSQLExpr *pRight, int32_t optrType) {
   return pExpr;
 }
 
-void tSQLExprDestroy(tSQLExpr *pExpr) {
+void tSQLExprNodeDestroy(tSQLExpr *pExpr) {
-  if (pExpr == NULL) return;
+  if (pExpr == NULL) {
-
+    return;
-  tSQLExprDestroy(pExpr->pLeft);
+  }
-  tSQLExprDestroy(pExpr->pRight);
 
   if (pExpr->nSQLOptr == TK_STRING) {
     tVariantDestroy(&pExpr->val);
@@ -288,6 +276,17 @@ void tSQLExprDestroy(tSQLExpr *pExpr) {
   free(pExpr);
 }
 
+void tSQLExprDestroy(tSQLExpr *pExpr) {
+  if (pExpr == NULL) {
+    return;
+  }
+
+  tSQLExprDestroy(pExpr->pLeft);
+  tSQLExprDestroy(pExpr->pRight);
+
+  tSQLExprNodeDestroy(pExpr);
+}
+
 static void *tVariantListExpand(tVariantList *pList) {
   if (pList->nAlloc <= pList->nExpr) {  //
     int32_t newSize = (pList->nAlloc << 1) + 4;
@@ -420,6 +419,44 @@ void setDBName(SSQLToken *pCpxName, SSQLToken *pDB) {
   pCpxName->n = pDB->n;
 }
 
+int32_t getTimestampInUsFromStrImpl(int64_t val, char unit, int64_t *result) {
+  *result = val;
+
+  switch (unit) {
+    case 's':
+      (*result) *= MILLISECOND_PER_SECOND;
+      break;
+    case 'm':
+      (*result) *= MILLISECOND_PER_MINUTE;
+      break;
+    case 'h':
+      (*result) *= MILLISECOND_PER_HOUR;
+      break;
+    case 'd':
+      (*result) *= MILLISECOND_PER_DAY;
+      break;
+    case 'w':
+      (*result) *= MILLISECOND_PER_WEEK;
+      break;
+    case 'n':
+      (*result) *= MILLISECOND_PER_MONTH;
+      break;
+    case 'y':
+      (*result) *= MILLISECOND_PER_YEAR;
+      break;
+    case 'a':
+      break;
+    default: {
+      ;
+      return -1;
+    }
+  }
+
+  /* get the value in microsecond */
+  (*result) *= 1000L;
+  return 0;
+}
+
 void tSQLSetColumnInfo(TAOS_FIELD *pField, SSQLToken *pName, TAOS_FIELD *pType) {
   int32_t maxLen = sizeof(pField->name) / sizeof(pField->name[0]);
   /* truncate the column name */
@@ -462,28 +499,38 @@ void tSQLSetColumnType(TAOS_FIELD *pField, SSQLToken *type) {
 /*
  * extract the select info out of sql string
  */
-SQuerySQL *tSetQuerySQLElems(SSQLToken *pSelectToken, tSQLExprList *pSelection, SSQLToken *pFrom, tSQLExpr *pWhere,
+SQuerySQL *tSetQuerySQLElems(SSQLToken *pSelectToken, tSQLExprList *pSelection, tVariantList *pFrom, tSQLExpr *pWhere,
                              tVariantList *pGroupby, tVariantList *pSortOrder, SSQLToken *pInterval,
                              SSQLToken *pSliding, tVariantList *pFill, SLimitVal *pLimit, SLimitVal *pGLimit) {
-  assert(pSelection != NULL && pFrom != NULL && pInterval != NULL && pLimit != NULL && pGLimit != NULL);
+  assert(pSelection != NULL);
 
   SQuerySQL *pQuery = calloc(1, sizeof(SQuerySQL));
   pQuery->selectToken = *pSelectToken;
   pQuery->selectToken.n = strlen(pQuery->selectToken.z);  // all later sql string are belonged to the stream sql
 
   pQuery->pSelection = pSelection;
-  pQuery->from = *pFrom;
+  pQuery->from = pFrom;
   pQuery->pGroupby = pGroupby;
   pQuery->pSortOrder = pSortOrder;
   pQuery->pWhere = pWhere;
 
-  pQuery->limit = *pLimit;
+  if (pLimit != NULL) {
-  pQuery->glimit = *pGLimit;
+    pQuery->limit = *pLimit;
+  }
+
+  if (pGLimit != NULL) {
+    pQuery->slimit = *pGLimit;
+  }
+
+  if (pInterval != NULL) {
+    pQuery->interval = *pInterval;
+  }
+
+  if (pSliding != NULL) {
+    pQuery->sliding = *pSliding;
+  }
 
-  pQuery->interval = *pInterval;
-  pQuery->sliding = *pSliding;
   pQuery->fillType = pFill;
-
   return pQuery;
 }
 
@@ -532,6 +579,9 @@ void destroyQuerySql(SQuerySQL *pSql) {
   tVariantListDestroy(pSql->pGroupby);
   pSql->pGroupby = NULL;
 
+  tVariantListDestroy(pSql->from);
+  pSql->from = NULL;
+
   tVariantListDestroy(pSql->fillType);
 
   free(pSql);
@@ -694,3 +744,22 @@ void setCreateAcctSQL(SSqlInfo *pInfo, int32_t type, SSQLToken *pName, SSQLToken
     tTokenListAppend(pInfo->pDCLInfo, pPwd);
   }
 }
+
+void setDefaultCreateDbOption(SCreateDBInfo *pDBInfo) {
+  pDBInfo->numOfBlocksPerTable = 50;
+  pDBInfo->compressionLevel = -1;
+
+  pDBInfo->commitLog = -1;
+  pDBInfo->commitTime = -1;
+  pDBInfo->tablesPerVnode = -1;
+  pDBInfo->numOfAvgCacheBlocks = -1;
+
+  pDBInfo->cacheBlockSize = -1;
+  pDBInfo->rowPerFileBlock = -1;
+  pDBInfo->daysPerFile = -1;
+
+  pDBInfo->replica = -1;
+  pDBInfo->keep = NULL;
+
+  memset(&pDBInfo->precision, 0, sizeof(SSQLToken));
+}

src/client/src/tscSchemaUtil.c

@@ -13,13 +13,10 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <stdbool.h>
-#include <stdint.h>
-#include <string.h>
-
 #include "os.h"
 #include "taosmsg.h"
 #include "tschemautil.h"
+#include "tsqldef.h"
 #include "ttypes.h"
 #include "tutil.h"
 
@@ -71,7 +68,7 @@ struct SSchema* tsGetSchema(SMeterMeta* pMeta) {
   if (pMeta == NULL) {
     return NULL;
   }
-  return tsGetSchemaColIdx(pMeta, 0);
+  return tsGetColumnSchema(pMeta, 0);
 }
 
 struct SSchema* tsGetTagSchema(SMeterMeta* pMeta) {
@@ -79,24 +76,32 @@ struct SSchema* tsGetTagSchema(SMeterMeta* pMeta) {
     return NULL;
   }
 
-  return tsGetSchemaColIdx(pMeta, pMeta->numOfColumns);
+  return tsGetColumnSchema(pMeta, pMeta->numOfColumns);
 }
 
-struct SSchema* tsGetSchemaColIdx(SMeterMeta* pMeta, int32_t startCol) {
+struct SSchema* tsGetColumnSchema(SMeterMeta* pMeta, int32_t startCol) {
-  if (pMeta->pSchema == 0) {
+  return (SSchema*)(((char*)pMeta + sizeof(SMeterMeta)) + startCol * sizeof(SSchema));
-    pMeta->pSchema = sizeof(SMeterMeta);
-  }
-
-  return (SSchema*)(((char*)pMeta + pMeta->pSchema) + startCol * sizeof(SSchema));
 }
 
+/**
+ * the MeterMeta data format in memory is as follows:
+ *
+ * +--------------------+
+ * |SMeterMeta Body data|  sizeof(SMeterMeta)
+ * +--------------------+
+ * |Schema data         |  numOfTotalColumns * sizeof(SSchema)
+ * +--------------------+
+ * |Tags data           |  tag_col_1.bytes + tag_col_2.bytes + ....
+ * +--------------------+
+ *
+ * @param pMeta
+ * @return
+ */
 char* tsGetTagsValue(SMeterMeta* pMeta) {
-  if (pMeta->tags == 0) {
+  int32_t  numOfTotalCols = pMeta->numOfColumns + pMeta->numOfTags;
-    int32_t numOfTotalCols = pMeta->numOfColumns + pMeta->numOfTags;
+  uint32_t offset = sizeof(SMeterMeta) + numOfTotalCols * sizeof(SSchema);
-    pMeta->tags = sizeof(SMeterMeta) + numOfTotalCols * sizeof(SSchema);
-  }
 
-  return ((char*)pMeta + pMeta->tags);
+  return ((char*)pMeta + offset);
 }
 
 bool tsMeterMetaIdentical(SMeterMeta* p1, SMeterMeta* p2) {
@@ -111,13 +116,14 @@ bool tsMeterMetaIdentical(SMeterMeta* p1, SMeterMeta* p2) {
   size_t size = sizeof(SMeterMeta) + p1->numOfColumns * sizeof(SSchema);
 
   for (int32_t i = 0; i < p1->numOfTags; ++i) {
-    SSchema* pColSchema = tsGetSchemaColIdx(p1, i + p1->numOfColumns);
+    SSchema* pColSchema = tsGetColumnSchema(p1, i + p1->numOfColumns);
     size += pColSchema->bytes;
   }
 
   return memcmp(p1, p2, size) == 0;
 }
 
+//todo refactor
 static FORCE_INLINE char* skipSegments(char* input, char delimiter, int32_t num) {
   for (int32_t i = 0; i < num; ++i) {
     while (*input != 0 && *input++ != delimiter) {
@@ -142,7 +148,33 @@ void extractMeterName(char* meterId, char* name) {
   copySegment(name, r, TS_PATH_DELIMITER[0]);
 }
 
-void extractDBName(char* meterId, char* name) {
+SSQLToken extractDBName(char* meterId, char* name) {
   char* r = skipSegments(meterId, TS_PATH_DELIMITER[0], 1);
   copySegment(name, r, TS_PATH_DELIMITER[0]);
+
+  SSQLToken token = {.z = name, .n = strlen(name), .type = TK_STRING};
+  return token;
+}
+
+/*
+ * tablePrefix.columnName
+ * extract table name and save it in pTable, with only column name in pToken
+ */
+void extractTableNameFromToken(SSQLToken* pToken, SSQLToken* pTable) {
+  const char sep = TS_PATH_DELIMITER[0];
+
+  if (pToken == pTable || pToken == NULL || pTable == NULL) {
+    return;
+  }
+
+  char* r = strnchr(pToken->z, sep, pToken->n, false);
+
+  if (r != NULL) {  // record the table name token
+    pTable->n = r - pToken->z;
+    pTable->z = pToken->z;
+
+    r += 1;
+    pToken->n -= (r - pToken->z);
+    pToken->z = r;
+  }
 }

src/client/src/tscSecondaryMerge.c

@@ -13,12 +13,7 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <assert.h>
+#include "os.h"
-#include <stdbool.h>
-#include <stddef.h>
-#include <stdlib.h>
-
-#include "tlosertree.h"
 #include "tlosertree.h"
 #include "tscSecondaryMerge.h"
 #include "tscUtil.h"
@@ -61,16 +56,17 @@ int32_t treeComparator(const void *pLeft, const void *pRight, void *param) {
 static void tscInitSqlContext(SSqlCmd *pCmd, SSqlRes *pRes, SLocalReducer *pReducer, tOrderDescriptor *pDesc) {
   /*
    * the fields and offset attributes in pCmd and pModel may be different due to
-   * merge requirement. So, the final result in STscRes structure is formatted in accordance with the pCmd object.
+   * merge requirement. So, the final result in pRes structure is formatted in accordance with the pCmd object.
    */
   for (int32_t i = 0; i < pCmd->fieldsInfo.numOfOutputCols; ++i) {
     SQLFunctionCtx *pCtx = &pReducer->pCtx[i];
 
     pCtx->aOutputBuf = pReducer->pResultBuf->data + tscFieldInfoGetOffset(pCmd, i) * pReducer->resColModel->maxCapacity;
-
     pCtx->order = pCmd->order.order;
-    pCtx->aInputElemBuf =
+    pCtx->functionId = pCmd->exprsInfo.pExprs[i].functionId;
-        pReducer->pTempBuffer->data + pDesc->pSchema->colOffset[i];  // input buffer hold only one point data
+
+    // input buffer hold only one point data
+    pCtx->aInputElemBuf = pReducer->pTempBuffer->data + pDesc->pSchema->colOffset[i];
 
     // input data format comes from pModel
     pCtx->inputType = pDesc->pSchema->pFields[i].type;
@@ -80,28 +76,54 @@ static void tscInitSqlContext(SSqlCmd *pCmd, SSqlRes *pRes, SLocalReducer *pRedu
     // output data format yet comes from pCmd.
     pCtx->outputBytes = pField->bytes;
     pCtx->outputType = pField->type;
-    pCtx->numOfOutputElems = 0;
 
-    pCtx->numOfIteratedElems = 0;
     pCtx->startOffset = 0;
     pCtx->size = 1;
-    pCtx->hasNullValue = true;
+    pCtx->hasNull = true;
     pCtx->currentStage = SECONDARY_STAGE_MERGE;
 
     pRes->bytes[i] = pField->bytes;
 
-    int32_t sqlFunction = tscSqlExprGet(pCmd, i)->sqlFuncId;
+    SSqlExpr *pExpr = tscSqlExprGet(pCmd, i);
-    if (sqlFunction == TSDB_FUNC_TOP_DST || sqlFunction == TSDB_FUNC_BOTTOM_DST) {
-      /* for top_dst/bottom_dst function, the output of timestamp is the first column */
-      pCtx->ptsOutputBuf = pReducer->pCtx[0].aOutputBuf;
 
+    // for top/bottom function, the output of timestamp is the first column
+    int32_t   functionId = pExpr->functionId;
+    if (functionId == TSDB_FUNC_TOP || functionId == TSDB_FUNC_BOTTOM) {
+      pCtx->ptsOutputBuf = pReducer->pCtx[0].aOutputBuf;
       pCtx->param[2].i64Key = pCmd->order.order;
       pCtx->param[2].nType = TSDB_DATA_TYPE_BIGINT;
-      pCtx->param[3].i64Key = sqlFunction;
-      pCtx->param[3].nType = TSDB_DATA_TYPE_BIGINT;
-
       pCtx->param[1].i64Key = pCmd->order.orderColId;
     }
+
+    SResultInfo *pResInfo = &pReducer->pResInfo[i];
+    pResInfo->bufLen = pExpr->interResBytes;
+    pResInfo->interResultBuf = calloc(1, (size_t)pResInfo->bufLen);
+
+    pCtx->resultInfo = &pReducer->pResInfo[i];
+    pCtx->resultInfo->superTableQ = true;
+  }
+
+  int16_t n = 0;
+  int16_t tagLen = 0;
+  SQLFunctionCtx** pTagCtx = calloc(pCmd->fieldsInfo.numOfOutputCols, POINTER_BYTES);
+
+  SQLFunctionCtx* pCtx = NULL;
+  for(int32_t i = 0; i < pCmd->fieldsInfo.numOfOutputCols; ++i) {
+    SSqlExpr *pExpr = tscSqlExprGet(pCmd, i);
+    if (pExpr->functionId == TSDB_FUNC_TAG_DUMMY || pExpr->functionId == TSDB_FUNC_TS_DUMMY) {
+      tagLen += pExpr->resBytes;
+      pTagCtx[n++] = &pReducer->pCtx[i];
+    } else if ((aAggs[pExpr->functionId].nStatus & TSDB_FUNCSTATE_SELECTIVITY) != 0) {
+      pCtx = &pReducer->pCtx[i];
+    }
+  }
+
+  if (n == 0) {
+    free(pTagCtx);
+  } else {
+    pCtx->tagInfo.pTagCtxList = pTagCtx;
+    pCtx->tagInfo.numOfTagCols = n;
+    pCtx->tagInfo.tagsLen = tagLen;
   }
 }
 
@@ -240,13 +262,8 @@ void tscCreateLocalReducer(tExtMemBuffer **pMemBuffer, int32_t numOfBuffer, tOrd
   pReducer->hasUnprocessedRow = false;
 
   pReducer->prevRowOfInput = (char *)calloc(1, pReducer->rowSize);
-  if (pReducer->prevRowOfInput == 0) {
-    // todo release previously allocated memory
-    pRes->code = TSDB_CODE_CLI_OUT_OF_MEMORY;
-    return;
-  }
 
-  /* used to keep the latest input row */
+  // used to keep the latest input row
   pReducer->pTempBuffer = (tFilePage *)calloc(1, pReducer->rowSize + sizeof(tFilePage));
 
   pReducer->discardData = (tFilePage *)calloc(1, pReducer->rowSize + sizeof(tFilePage));
@@ -254,44 +271,56 @@ void tscCreateLocalReducer(tExtMemBuffer **pMemBuffer, int32_t numOfBuffer, tOrd
 
   pReducer->nResultBufSize = pMemBuffer[0]->nPageSize * 16;
   pReducer->pResultBuf = (tFilePage *)calloc(1, pReducer->nResultBufSize + sizeof(tFilePage));
-
+  
   int32_t finalRowLength = tscGetResRowLength(pCmd);
   pReducer->resColModel = finalmodel;
   pReducer->resColModel->maxCapacity = pReducer->nResultBufSize / finalRowLength;
   assert(finalRowLength <= pReducer->rowSize);
 
+  pReducer->pFinalRes = calloc(1, pReducer->rowSize * pReducer->resColModel->maxCapacity);
   pReducer->pBufForInterpo = calloc(1, pReducer->nResultBufSize);
 
-  if (pReducer->pTempBuffer == NULL || pReducer->pResultBuf == NULL || pReducer->pBufForInterpo == NULL) {
+  if (pReducer->pTempBuffer == NULL|| pReducer->discardData == NULL  || pReducer->pResultBuf == NULL ||
+      pReducer->pBufForInterpo == NULL || pReducer->pFinalRes == NULL || pReducer->prevRowOfInput == NULL) {
+    tfree(pReducer->pTempBuffer);
+    tfree(pReducer->discardData);
+    tfree(pReducer->pResultBuf);
+    tfree(pReducer->pFinalRes);	
+    tfree(pReducer->pBufForInterpo);
+    tfree(pReducer->prevRowOfInput);
+
     pRes->code = TSDB_CODE_CLI_OUT_OF_MEMORY;
     return;
   }
 
   pReducer->pTempBuffer->numOfElems = 0;
+  pReducer->pResInfo = calloc((size_t)pCmd->fieldsInfo.numOfOutputCols, sizeof(SResultInfo));
 
   tscCreateResPointerInfo(pCmd, pRes);
   tscInitSqlContext(pCmd, pRes, pReducer, pDesc);
 
-  /* we change the maxCapacity of schema to denote that there is only one row in temp buffer */
+  // we change the maxCapacity of schema to denote that there is only one row in temp buffer
   pReducer->pDesc->pSchema->maxCapacity = 1;
   pReducer->offset = pCmd->limit.offset;
 
   pRes->pLocalReducer = pReducer;
   pRes->numOfGroups = 0;
 
-  int16_t prec = pCmd->pMeterMeta->precision;
+  SMeterMetaInfo* pMeterMetaInfo = tscGetMeterMetaInfo(pCmd, 0);
+  int16_t prec = pMeterMetaInfo->pMeterMeta->precision;
+
   int64_t stime = (pCmd->stime < pCmd->etime) ? pCmd->stime : pCmd->etime;
   int64_t revisedSTime = taosGetIntervalStartTimestamp(stime, pCmd->nAggTimeInterval, pCmd->intervalTimeUnit, prec);
 
   SInterpolationInfo *pInterpoInfo = &pReducer->interpolationInfo;
-  taosInitInterpoInfo(pInterpoInfo, pCmd->order.order, revisedSTime, pCmd->groupbyExpr.numOfGroupbyCols,
+  taosInitInterpoInfo(pInterpoInfo, pCmd->order.order, revisedSTime, pCmd->groupbyExpr.numOfGroupCols,
                       pReducer->rowSize);
 
-  int32_t startIndex = pCmd->fieldsInfo.numOfOutputCols - pCmd->groupbyExpr.numOfGroupbyCols;
+  int32_t startIndex = pCmd->fieldsInfo.numOfOutputCols - pCmd->groupbyExpr.numOfGroupCols;
 
-  if (pCmd->groupbyExpr.numOfGroupbyCols > 0) {
+  if (pCmd->groupbyExpr.numOfGroupCols > 0) {
-    pInterpoInfo->pTags[0] = (char *)pInterpoInfo->pTags + POINTER_BYTES * pCmd->groupbyExpr.numOfGroupbyCols;
+    pInterpoInfo->pTags[0] = (char *)pInterpoInfo->pTags + POINTER_BYTES * pCmd->groupbyExpr.numOfGroupCols;
-    for (int32_t i = 1; i < pCmd->groupbyExpr.numOfGroupbyCols; ++i) {
+    for (int32_t i = 1; i < pCmd->groupbyExpr.numOfGroupCols; ++i) {
       pInterpoInfo->pTags[i] = pReducer->resColModel->pFields[startIndex + i - 1].bytes + pInterpoInfo->pTags[i - 1];
     }
   } else {
@@ -399,12 +428,13 @@ void tscDestroyLocalReducer(SSqlObj *pSql) {
     return;
   }
 
+  SSqlCmd *pCmd = &pSql->cmd;
+
   // there is no more result, so we release all allocated resource
-  SLocalReducer *pLocalReducer =
+  SLocalReducer *pLocalReducer = (SLocalReducer*)atomic_exchange_ptr(&pRes->pLocalReducer, NULL);
-      (SLocalReducer *)__sync_val_compare_and_swap_64(&pRes->pLocalReducer, pRes->pLocalReducer, 0);
   if (pLocalReducer != NULL) {
     int32_t status = 0;
-    while ((status = __sync_val_compare_and_swap_32(&pLocalReducer->status, TSC_LOCALREDUCE_READY,
+    while ((status = atomic_val_compare_exchange_32(&pLocalReducer->status, TSC_LOCALREDUCE_READY,
                                                     TSC_LOCALREDUCE_TOBE_FREED)) == TSC_LOCALREDUCE_IN_PROGRESS) {
       taosMsleep(100);
       tscTrace("%p waiting for delete procedure, status: %d", pSql, status);
@@ -413,12 +443,29 @@ void tscDestroyLocalReducer(SSqlObj *pSql) {
     tfree(pLocalReducer->interpolationInfo.prevValues);
     tfree(pLocalReducer->interpolationInfo.pTags);
 
-    tfree(pLocalReducer->pCtx);
+    if (pLocalReducer->pCtx != NULL) {
+      for(int32_t i = 0; i < pCmd->fieldsInfo.numOfOutputCols; ++i) {
+        SQLFunctionCtx *pCtx = &pLocalReducer->pCtx[i];
+        tVariantDestroy(&pCtx->tag);
+      }
+
+      tfree(pLocalReducer->pCtx);
+    }
+
+
     tfree(pLocalReducer->prevRowOfInput);
 
     tfree(pLocalReducer->pTempBuffer);
     tfree(pLocalReducer->pResultBuf);
 
+    if (pLocalReducer->pResInfo != NULL) {
+      for (int32_t i = 0; i < pCmd->fieldsInfo.numOfOutputCols; ++i) {
+        tfree(pLocalReducer->pResInfo[i].interResultBuf);
+      }
+
+      tfree(pLocalReducer->pResInfo);
+    }
+
     if (pLocalReducer->pLoserTree) {
       tfree(pLocalReducer->pLoserTree->param);
       tfree(pLocalReducer->pLoserTree);
@@ -447,8 +494,8 @@ void tscDestroyLocalReducer(SSqlObj *pSql) {
 
 static int32_t createOrderDescriptor(tOrderDescriptor **pOrderDesc, SSqlCmd *pCmd, tColModel *pModel) {
   int32_t numOfGroupByCols = 0;
-  if (pCmd->groupbyExpr.numOfGroupbyCols > 0) {
+  if (pCmd->groupbyExpr.numOfGroupCols > 0) {
-    numOfGroupByCols = pCmd->groupbyExpr.numOfGroupbyCols;
+    numOfGroupByCols = pCmd->groupbyExpr.numOfGroupCols;
   }
 
   // primary timestamp column is involved in final result
@@ -462,15 +509,15 @@ static int32_t createOrderDescriptor(tOrderDescriptor **pOrderDesc, SSqlCmd *pCm
   }
 
   if (numOfGroupByCols > 0) {
-    int32_t startCols = pCmd->fieldsInfo.numOfOutputCols - pCmd->groupbyExpr.numOfGroupbyCols;
+    int32_t startCols = pCmd->fieldsInfo.numOfOutputCols - pCmd->groupbyExpr.numOfGroupCols;
 
     // tags value locate at the last columns
-    for (int32_t i = 0; i < pCmd->groupbyExpr.numOfGroupbyCols; ++i) {
+    for (int32_t i = 0; i < pCmd->groupbyExpr.numOfGroupCols; ++i) {
       orderIdx[i] = startCols++;
     }
 
     if (pCmd->nAggTimeInterval != 0) {
-      //the first column is the timestamp, handles queries like "interval(10m) group by tags"
+      // the first column is the timestamp, handles queries like "interval(10m) group by tags"
       orderIdx[numOfGroupByCols - 1] = PRIMARYKEY_TIMESTAMP_COL_INDEX;
     }
   }
@@ -486,7 +533,7 @@ static int32_t createOrderDescriptor(tOrderDescriptor **pOrderDesc, SSqlCmd *pCm
 }
 
 bool isSameGroup(SSqlCmd *pCmd, SLocalReducer *pReducer, char *pPrev, tFilePage *tmpBuffer) {
-  int16_t functionId = tscSqlExprGet(pCmd, 0)->sqlFuncId;
+  int16_t functionId = tscSqlExprGet(pCmd, 0)->functionId;
 
   // disable merge procedure for column projection query
   if (functionId == TSDB_FUNC_PRJ || functionId == TSDB_FUNC_ARITHM) {
@@ -525,7 +572,9 @@ int32_t tscLocalReducerEnvCreate(SSqlObj *pSql, tExtMemBuffer ***pMemBuffer, tOr
   tColModel *pModel = NULL;
   *pFinalModel = NULL;
 
-  (*pMemBuffer) = (tExtMemBuffer **)malloc(POINTER_BYTES * pCmd->pMetricMeta->numOfVnodes);
+  SMeterMetaInfo *pMeterMetaInfo = tscGetMeterMetaInfo(pCmd, 0);
+
+  (*pMemBuffer) = (tExtMemBuffer **)malloc(POINTER_BYTES * pMeterMetaInfo->pMetricMeta->numOfVnodes);
   if (*pMemBuffer == NULL) {
     tscError("%p failed to allocate memory", pSql);
     pRes->code = TSDB_CODE_CLI_OUT_OF_MEMORY;
@@ -552,10 +601,10 @@ int32_t tscLocalReducerEnvCreate(SSqlObj *pSql, tExtMemBuffer ***pMemBuffer, tOr
   int32_t capacity = nBufferSizes / rlen;
   pModel = tColModelCreate(pSchema, pCmd->fieldsInfo.numOfOutputCols, capacity);
 
-  for (int32_t i = 0; i < pCmd->pMetricMeta->numOfVnodes; ++i) {
+  for (int32_t i = 0; i < pMeterMetaInfo->pMetricMeta->numOfVnodes; ++i) {
     char tmpPath[512] = {0};
-    getExtTmpfilePath("/tv_bf_db_%lld_%lld_%d.d", taosGetPthreadId(), i, 0, tmpPath);
+    getTmpfilePath("tv_bf_db", tmpPath);
-    tscTrace("%p create tmp file:%s", pSql, tmpPath);
+    tscTrace("%p create [%d](%d) tmp file for subquery:%s", pSql, pMeterMetaInfo->pMetricMeta->numOfVnodes, i, tmpPath);
 
     tExtMemBufferCreate(&(*pMemBuffer)[i], nBufferSizes, rlen, tmpPath, pModel);
     (*pMemBuffer)[i]->flushModel = MULTIPLE_APPEND_MODEL;
@@ -667,11 +716,13 @@ void adjustLoserTreeFromNewData(SLocalReducer *pLocalReducer, SLocalDataSource *
 
 void savePrevRecordAndSetupInterpoInfo(SLocalReducer *pLocalReducer, SSqlCmd *pCmd, SInterpolationInfo *pInterpoInfo) {
   // discard following dataset in the same group and reset the interpolation information
-  int16_t prec = pCmd->pMeterMeta->precision;
+  SMeterMetaInfo* pMeterMetaInfo = tscGetMeterMetaInfo(pCmd, 0);
+  int16_t prec = pMeterMetaInfo->pMeterMeta->precision;
+
   int64_t stime = (pCmd->stime < pCmd->etime) ? pCmd->stime : pCmd->etime;
   int64_t revisedSTime = taosGetIntervalStartTimestamp(stime, pCmd->nAggTimeInterval, pCmd->intervalTimeUnit, prec);
 
-  taosInitInterpoInfo(pInterpoInfo, pCmd->order.order, revisedSTime, pCmd->groupbyExpr.numOfGroupbyCols,
+  taosInitInterpoInfo(pInterpoInfo, pCmd->order.order, revisedSTime, pCmd->groupbyExpr.numOfGroupCols,
                       pLocalReducer->rowSize);
 
   pLocalReducer->discard = true;
@@ -735,10 +786,6 @@ static void doInterpolateResult(SSqlObj *pSql, SLocalReducer *pLocalReducer, boo
     assert(pRes->pLocalReducer == NULL);
   }
 
-  if (pLocalReducer->pFinalRes == NULL) {
-    pLocalReducer->pFinalRes = malloc(pLocalReducer->rowSize * pLocalReducer->resColModel->maxCapacity);
-  }
-
   if (pCmd->nAggTimeInterval == 0 || pCmd->interpoType == TSDB_INTERPO_NONE) {
     // no interval query, no interpolation
     pRes->data = pLocalReducer->pFinalRes;
@@ -808,10 +855,11 @@ static void doInterpolateResult(SSqlObj *pSql, SLocalReducer *pLocalReducer, boo
 
   for (int32_t i = 0; i < pCmd->fieldsInfo.numOfOutputCols; ++i) {
     srcData[i] = pLocalReducer->pBufForInterpo + tscFieldInfoGetOffset(pCmd, i) * pInterpoInfo->numOfRawDataInRows;
-    functions[i] = tscSqlExprGet(pCmd, i)->sqlFuncId;
+    functions[i] = tscSqlExprGet(pCmd, i)->functionId;
   }
 
-  int8_t precision = pCmd->pMeterMeta->precision;
+  SMeterMetaInfo* pMeterMetaInfo = tscGetMeterMetaInfo(pCmd, 0);
+  int8_t precision = pMeterMetaInfo->pMeterMeta->precision;
 
   while (1) {
     int32_t remains = taosNumOfRemainPoints(pInterpoInfo);
@@ -911,22 +959,42 @@ static void savePreviousRow(SLocalReducer *pLocalReducer, tFilePage *tmpBuffer)
   pLocalReducer->hasPrevRow = true;
 }
 
-static void handleUnprocessedRow(SLocalReducer *pLocalReducer, SSqlCmd *pCmd, tFilePage *tmpBuffer) {
+static void doExecuteSecondaryMerge(SSqlCmd* pCmd, SLocalReducer *pLocalReducer, bool needInit) {
-  if (pLocalReducer->hasUnprocessedRow) {
+  // the tag columns need to be set before all functions execution
-    for (int32_t j = 0; j < pCmd->fieldsInfo.numOfOutputCols; ++j) {
+  for(int32_t j = 0; j < pCmd->fieldsInfo.numOfOutputCols; ++j) {
-      SSqlExpr *pExpr = tscSqlExprGet(pCmd, j);
+    SSqlExpr *      pExpr = tscSqlExprGet(pCmd, j);
+    SQLFunctionCtx *pCtx = &pLocalReducer->pCtx[j];
 
-      tVariantAssign(&pLocalReducer->pCtx[j].param[0], &pExpr->param[0]);
+    tVariantAssign(&pCtx->param[0], &pExpr->param[0]);
-      aAggs[pExpr->sqlFuncId].init(&pLocalReducer->pCtx[j]);
 
-      pLocalReducer->pCtx[j].currentStage = SECONDARY_STAGE_MERGE;
+    // tags/tags_dummy function, the tag field of SQLFunctionCtx is from the input buffer
-      pLocalReducer->pCtx[j].numOfIteratedElems = 0;
+    if (pExpr->functionId == TSDB_FUNC_TAG_DUMMY || pExpr->functionId == TSDB_FUNC_TAG ||
-      aAggs[pExpr->sqlFuncId].distSecondaryMergeFunc(&pLocalReducer->pCtx[j]);
+        pExpr->functionId == TSDB_FUNC_TS_DUMMY) {
+      tVariantDestroy(&pCtx->tag);
+      tVariantCreateFromBinary(&pCtx->tag, pCtx->aInputElemBuf, pCtx->inputBytes, pCtx->inputType);
     }
 
-    pLocalReducer->hasUnprocessedRow = false;
+    pCtx->currentStage = SECONDARY_STAGE_MERGE;
 
-    // copy to previous temp buffer
+    if (needInit) {
+      aAggs[pExpr->functionId].init(pCtx);
+    }
+  }
+
+  for (int32_t j = 0; j < pCmd->fieldsInfo.numOfOutputCols; ++j) {
+    int32_t functionId = tscSqlExprGet(pCmd, j)->functionId;
+    if (functionId == TSDB_FUNC_TAG_DUMMY || functionId == TSDB_FUNC_TS_DUMMY) {
+      continue;
+    }
+
+    aAggs[functionId].distSecondaryMergeFunc(&pLocalReducer->pCtx[j]);
+  }
+}
+
+static void handleUnprocessedRow(SSqlCmd* pCmd, SLocalReducer *pLocalReducer, tFilePage *tmpBuffer) {
+  if (pLocalReducer->hasUnprocessedRow) {
+    pLocalReducer->hasUnprocessedRow = false;
+    doExecuteSecondaryMerge(pCmd, pLocalReducer, true);
     savePreviousRow(pLocalReducer, tmpBuffer);
   }
 }
@@ -935,7 +1003,7 @@ static int64_t getNumOfResultLocal(SSqlCmd *pCmd, SQLFunctionCtx *pCtx) {
   int64_t maxOutput = 0;
 
   for (int32_t j = 0; j < pCmd->exprsInfo.numOfExprs; ++j) {
-    int32_t functionId = tscSqlExprGet(pCmd, j)->sqlFuncId;
+    int32_t functionId = tscSqlExprGet(pCmd, j)->functionId;
 
     /*
      * ts, tag, tagprj function can not decide the output number of current query
@@ -945,34 +1013,37 @@ static int64_t getNumOfResultLocal(SSqlCmd *pCmd, SQLFunctionCtx *pCtx) {
       continue;
     }
 
-    if (maxOutput < pCtx[j].numOfOutputElems) {
+    if (maxOutput < GET_RES_INFO(&pCtx[j])->numOfRes) {
-      maxOutput = pCtx[j].numOfOutputElems;
+      maxOutput = GET_RES_INFO(&pCtx[j])->numOfRes;
     }
   }
   return maxOutput;
 }
 
 /*
- * in handling the to/bottom query, which produce more than one rows result,
+ * in handling the top/bottom query, which produce more than one rows result,
  * the tsdb_func_tags only fill the first row of results, the remain rows need to
  * filled with the same result, which is the tags, specified in group by clause
+ *
  */
 static void fillMultiRowsOfTagsVal(SSqlCmd *pCmd, int32_t numOfRes, SLocalReducer *pLocalReducer) {
-  int32_t startIndex = pCmd->fieldsInfo.numOfOutputCols - pCmd->groupbyExpr.numOfGroupbyCols;
+  int32_t maxBufSize = 0;  // find the max tags column length to prepare the buffer
-
+  for (int32_t k = 0; k < pCmd->fieldsInfo.numOfOutputCols; ++k) {
-  int32_t maxBufSize = 0;
-  for (int32_t k = startIndex; k < pCmd->fieldsInfo.numOfOutputCols; ++k) {
     SSqlExpr *pExpr = tscSqlExprGet(pCmd, k);
-    if (maxBufSize < pExpr->resBytes) {
+    if (maxBufSize < pExpr->resBytes && pExpr->functionId == TSDB_FUNC_TAG) {
       maxBufSize = pExpr->resBytes;
     }
-    assert(pExpr->sqlFuncId == TSDB_FUNC_TAG);
   }
 
   assert(maxBufSize >= 0);
 
-  char *buf = malloc((size_t)maxBufSize);
+  char *buf = malloc((size_t) maxBufSize);
-  for (int32_t k = startIndex; k < pCmd->fieldsInfo.numOfOutputCols; ++k) {
+  for (int32_t k = 0; k < pCmd->fieldsInfo.numOfOutputCols; ++k) {
+    SSqlExpr *pExpr = tscSqlExprGet(pCmd, k);
+    if (pExpr->functionId != TSDB_FUNC_TAG) {
+      continue;
+    }
+
     int32_t inc = numOfRes - 1;  // tsdb_func_tag function only produce one row of result
     memset(buf, 0, (size_t)maxBufSize);
 
@@ -991,7 +1062,10 @@ static void fillMultiRowsOfTagsVal(SSqlCmd *pCmd, int32_t numOfRes, SLocalReduce
 int32_t finalizeRes(SSqlCmd *pCmd, SLocalReducer *pLocalReducer) {
   for (int32_t k = 0; k < pCmd->fieldsInfo.numOfOutputCols; ++k) {
     SSqlExpr *pExpr = tscSqlExprGet(pCmd, k);
-    aAggs[pExpr->sqlFuncId].xFinalize(&pLocalReducer->pCtx[k]);
+    aAggs[pExpr->functionId].xFinalize(&pLocalReducer->pCtx[k]);
+
+    // allow to re-initialize for the next round
+    pLocalReducer->pCtx[k].resultInfo->initialized = false;
   }
 
   pLocalReducer->hasPrevRow = false;
@@ -1012,7 +1086,7 @@ int32_t finalizeRes(SSqlCmd *pCmd, SLocalReducer *pLocalReducer) {
  */
 bool needToMerge(SSqlCmd *pCmd, SLocalReducer *pLocalReducer, tFilePage *tmpBuffer) {
   int32_t ret = 0;  // merge all result by default
-  int16_t functionId = tscSqlExprGet(pCmd, 0)->sqlFuncId;
+  int16_t functionId = tscSqlExprGet(pCmd, 0)->functionId;
 
   if (functionId == TSDB_FUNC_PRJ || functionId == TSDB_FUNC_ARITHM) {  // column projection query
     ret = 1;                                                            // disable merge procedure
@@ -1033,7 +1107,7 @@ bool needToMerge(SSqlCmd *pCmd, SLocalReducer *pLocalReducer, tFilePage *tmpBuff
 }
 
 static bool reachGroupResultLimit(SSqlCmd *pCmd, SSqlRes *pRes) {
-  return (pRes->numOfGroups >= pCmd->glimit.limit && pCmd->glimit.limit >= 0);
+  return (pRes->numOfGroups >= pCmd->slimit.limit && pCmd->slimit.limit >= 0);
 }
 
 static bool saveGroupResultInfo(SSqlObj *pSql) {
@@ -1042,7 +1116,7 @@ static bool saveGroupResultInfo(SSqlObj *pSql) {
 
   pRes->numOfGroups += 1;
 
-  // the output group is limited by the glimit clause
+  // the output group is limited by the slimit clause
   if (reachGroupResultLimit(pCmd, pRes)) {
     return true;
   }
@@ -1073,9 +1147,9 @@ bool doGenerateFinalResults(SSqlObj *pSql, SLocalReducer *pLocalReducer, bool no
    * ignore the output of the current group since this group is skipped by user
    * We set the numOfRows to be 0 and discard the possible remain results.
    */
-  if (pCmd->glimit.offset > 0) {
+  if (pCmd->slimit.offset > 0) {
     pRes->numOfRows = 0;
-    pCmd->glimit.offset -= 1;
+    pCmd->slimit.offset -= 1;
     pLocalReducer->discard = !noMoreCurrentGroupRes;
     return false;
   }
@@ -1089,9 +1163,9 @@ bool doGenerateFinalResults(SSqlObj *pSql, SLocalReducer *pLocalReducer, bool no
 #endif
 
   SInterpolationInfo *pInterpoInfo = &pLocalReducer->interpolationInfo;
-  int32_t             startIndex = pCmd->fieldsInfo.numOfOutputCols - pCmd->groupbyExpr.numOfGroupbyCols;
+  int32_t             startIndex = pCmd->fieldsInfo.numOfOutputCols - pCmd->groupbyExpr.numOfGroupCols;
 
-  for (int32_t i = 0; i < pCmd->groupbyExpr.numOfGroupbyCols; ++i) {
+  for (int32_t i = 0; i < pCmd->groupbyExpr.numOfGroupCols; ++i) {
     memcpy(pInterpoInfo->pTags[i],
            pLocalReducer->pBufForInterpo + pModel->colOffset[startIndex + i] * pResBuf->numOfElems,
            pModel->pFields[startIndex + i].bytes);
@@ -1113,20 +1187,21 @@ void resetOutputBuf(SSqlCmd *pCmd, SLocalReducer *pLocalReducer) {  // reset out
 }
 
 static void resetEnvForNewResultset(SSqlRes *pRes, SSqlCmd *pCmd, SLocalReducer *pLocalReducer) {
-  //In handling data in other groups, we need to reset the interpolation information for a new group data
+  // In handling data in other groups, we need to reset the interpolation information for a new group data
   pRes->numOfRows = 0;
   pRes->numOfTotal = 0;
   pCmd->limit.offset = pLocalReducer->offset;
 
-  int16_t precision = pCmd->pMeterMeta->precision;
+  SMeterMetaInfo* pMeterMetaInfo = tscGetMeterMetaInfo(pCmd, 0);
+  int16_t precision = pMeterMetaInfo->pMeterMeta->precision;
 
+  // for group result interpolation, do not return if not data is generated
   if (pCmd->interpoType != TSDB_INTERPO_NONE) {
-    /* for group result interpolation, do not return if not data is generated */
     int64_t stime = (pCmd->stime < pCmd->etime) ? pCmd->stime : pCmd->etime;
     int64_t newTime = taosGetIntervalStartTimestamp(stime, pCmd->nAggTimeInterval, pCmd->intervalTimeUnit, precision);
 
-    taosInitInterpoInfo(&pLocalReducer->interpolationInfo, pCmd->order.order, newTime,
+    taosInitInterpoInfo(&pLocalReducer->interpolationInfo, pCmd->order.order, newTime, pCmd->groupbyExpr.numOfGroupCols,
-                        pCmd->groupbyExpr.numOfGroupbyCols, pLocalReducer->rowSize);
+                        pLocalReducer->rowSize);
   }
 }
 
@@ -1140,7 +1215,9 @@ static bool doInterpolationForCurrentGroup(SSqlObj *pSql) {
 
   SLocalReducer *     pLocalReducer = pRes->pLocalReducer;
   SInterpolationInfo *pInterpoInfo = &pLocalReducer->interpolationInfo;
-  int8_t p = pCmd->pMeterMeta->precision;
+
+  SMeterMetaInfo* pMeterMetaInfo = tscGetMeterMetaInfo(pCmd, 0);
+  int8_t p = pMeterMetaInfo->pMeterMeta->precision;
 
   if (taosHasRemainsDataForInterpolation(pInterpoInfo)) {
     assert(pCmd->interpoType != TSDB_INTERPO_NONE);
@@ -1170,7 +1247,9 @@ static bool doHandleLastRemainData(SSqlObj *pSql) {
   SInterpolationInfo *pInterpoInfo = &pLocalReducer->interpolationInfo;
 
   bool prevGroupCompleted = (!pLocalReducer->discard) && pLocalReducer->hasUnprocessedRow;
-  int8_t precision = pCmd->pMeterMeta->precision;
+
+  SMeterMetaInfo* pMeterMetaInfo = tscGetMeterMetaInfo(pCmd, 0);
+  int8_t precision = pMeterMetaInfo->pMeterMeta->precision;
 
   if ((isAllSourcesCompleted(pLocalReducer) && !pLocalReducer->hasPrevRow) || pLocalReducer->pLocalDataSrc[0] == NULL ||
       prevGroupCompleted) {
@@ -1214,40 +1293,17 @@ static void doMergeWithPrevRows(SSqlObj *pSql, int32_t numOfRes) {
 
   for (int32_t k = 0; k < pCmd->fieldsInfo.numOfOutputCols; ++k) {
     SSqlExpr *pExpr = tscSqlExprGet(pCmd, k);
+    SQLFunctionCtx *pCtx = &pLocalReducer->pCtx[k];
 
-    pLocalReducer->pCtx[k].aOutputBuf += pLocalReducer->pCtx[k].outputBytes * numOfRes;
+    pCtx->aOutputBuf += pCtx->outputBytes * numOfRes;
 
     // set the correct output timestamp column position
-    if (pExpr->sqlFuncId == TSDB_FUNC_TOP_DST || pExpr->sqlFuncId == TSDB_FUNC_BOTTOM_DST) {
+    if (pExpr->functionId == TSDB_FUNC_TOP || pExpr->functionId == TSDB_FUNC_BOTTOM) {
-      pLocalReducer->pCtx[k].ptsOutputBuf = ((char *)pLocalReducer->pCtx[k].ptsOutputBuf + TSDB_KEYSIZE * numOfRes);
+      pCtx->ptsOutputBuf = ((char *)pCtx->ptsOutputBuf + TSDB_KEYSIZE * numOfRes);
     }
-
-    /* set the parameters for the SQLFunctionCtx */
-    tVariantAssign(&pLocalReducer->pCtx[k].param[0], &pExpr->param[0]);
-
-    aAggs[pExpr->sqlFuncId].init(&pLocalReducer->pCtx[k]);
-    pLocalReducer->pCtx[k].currentStage = SECONDARY_STAGE_MERGE;
-    aAggs[pExpr->sqlFuncId].distSecondaryMergeFunc(&pLocalReducer->pCtx[k]);
   }
-}
 
-static void doExecuteSecondaryMerge(SSqlObj *pSql) {
+  doExecuteSecondaryMerge(pCmd, pLocalReducer, true);
-  SSqlCmd *      pCmd = &pSql->cmd;
-  SSqlRes *      pRes = &pSql->res;
-  SLocalReducer *pLocalReducer = pRes->pLocalReducer;
-
-  for (int32_t j = 0; j < pCmd->fieldsInfo.numOfOutputCols; ++j) {
-    SSqlExpr *pExpr = tscSqlExprGet(pCmd, j);
-
-    tVariantAssign(&pLocalReducer->pCtx[j].param[0], &pExpr->param[0]);
-    pLocalReducer->pCtx[j].numOfIteratedElems = 0;
-    pLocalReducer->pCtx[j].currentStage = 0;
-
-    aAggs[pExpr->sqlFuncId].init(&pLocalReducer->pCtx[j]);
-    pLocalReducer->pCtx[j].currentStage = SECONDARY_STAGE_MERGE;
-
-    aAggs[pExpr->sqlFuncId].distSecondaryMergeFunc(&pLocalReducer->pCtx[j]);
-  }
 }
 
 int32_t tscLocalDoReduce(SSqlObj *pSql) {
@@ -1270,10 +1326,9 @@ int32_t tscLocalDoReduce(SSqlObj *pSql) {
 
   // set the data merge in progress
   int32_t prevStatus =
-      __sync_val_compare_and_swap_32(&pLocalReducer->status, TSC_LOCALREDUCE_READY, TSC_LOCALREDUCE_IN_PROGRESS);
+      atomic_val_compare_exchange_32(&pLocalReducer->status, TSC_LOCALREDUCE_READY, TSC_LOCALREDUCE_IN_PROGRESS);
   if (prevStatus != TSC_LOCALREDUCE_READY || pLocalReducer == NULL) {
-    assert(prevStatus == TSC_LOCALREDUCE_TOBE_FREED);
+    assert(prevStatus == TSC_LOCALREDUCE_TOBE_FREED); // it is in tscDestroyLocalReducer function already
-    /* it is in tscDestroyLocalReducer function already */
     return TSDB_CODE_SUCCESS;
   }
 
@@ -1292,7 +1347,7 @@ int32_t tscLocalDoReduce(SSqlObj *pSql) {
   SLoserTreeInfo *pTree = pLocalReducer->pLoserTree;
 
   // clear buffer
-  handleUnprocessedRow(pLocalReducer, pCmd, tmpBuffer);
+  handleUnprocessedRow(pCmd, pLocalReducer, tmpBuffer);
   tColModel *pModel = pLocalReducer->pDesc->pSchema;
 
   while (1) {
@@ -1353,12 +1408,7 @@ int32_t tscLocalDoReduce(SSqlObj *pSql) {
     if (pLocalReducer->hasPrevRow) {
       if (needToMerge(pCmd, pLocalReducer, tmpBuffer)) {
         // belong to the group of the previous row, continue process it
-        for (int32_t j = 0; j < pCmd->fieldsInfo.numOfOutputCols; ++j) {
+        doExecuteSecondaryMerge(pCmd, pLocalReducer, false);
-          SSqlExpr *pExpr = tscSqlExprGet(pCmd, j);
-          tVariantAssign(&pLocalReducer->pCtx[j].param[0], &pExpr->param[0]);
-
-          aAggs[pExpr->sqlFuncId].distSecondaryMergeFunc(&pLocalReducer->pCtx[j]);
-        }
 
         // copy to buffer
         savePreviousRow(pLocalReducer, tmpBuffer);
@@ -1369,7 +1419,7 @@ int32_t tscLocalDoReduce(SSqlObj *pSql) {
          */
         int32_t numOfRes = finalizeRes(pCmd, pLocalReducer);
 
-        bool      sameGroup = isSameGroup(pCmd, pLocalReducer, pLocalReducer->prevRowOfInput, tmpBuffer);
+        bool       sameGroup = isSameGroup(pCmd, pLocalReducer, pLocalReducer->prevRowOfInput, tmpBuffer);
         tFilePage *pResBuf = pLocalReducer->pResultBuf;
 
         /*
@@ -1398,7 +1448,7 @@ int32_t tscLocalDoReduce(SSqlObj *pSql) {
           assert(pLocalReducer->status == TSC_LOCALREDUCE_IN_PROGRESS);
 
           if (pRes->numOfRows == 0) {
-            handleUnprocessedRow(pLocalReducer, pCmd, tmpBuffer);
+            handleUnprocessedRow(pCmd, pLocalReducer, tmpBuffer);
 
             if (!sameGroup) {
               /*
@@ -1418,7 +1468,7 @@ int32_t tscLocalDoReduce(SSqlObj *pSql) {
              * We start the process in a new round.
              */
             if (sameGroup) {
-              handleUnprocessedRow(pLocalReducer, pCmd, tmpBuffer);
+              handleUnprocessedRow(pCmd, pLocalReducer, tmpBuffer);
             }
           }
 
@@ -1435,7 +1485,7 @@ int32_t tscLocalDoReduce(SSqlObj *pSql) {
         }
       }
     } else {
-      doExecuteSecondaryMerge(pSql);
+      doExecuteSecondaryMerge(pCmd, pLocalReducer, true);
       savePreviousRow(pLocalReducer, tmpBuffer);  // copy the processed row to buffer
     }
 

src/client/src/tscSql.c

@@ -13,23 +13,23 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <stdio.h>
-#include <stdlib.h>
-
 #include "os.h"
 #include "tcache.h"
 #include "tlog.h"
 #include "trpc.h"
+#include "tscJoinProcess.h"
 #include "tscProfile.h"
 #include "tscSecondaryMerge.h"
 #include "tscUtil.h"
 #include "tsclient.h"
+#include "tscompression.h"
 #include "tsocket.h"
-#include "tsql.h"
+#include "tscSQLParser.h"
 #include "ttimer.h"
 #include "tutil.h"
+#include "tnote.h"
 
-TAOS *taos_connect_imp(char *ip, char *user, char *pass, char *db, int port, void (*fp)(void *, TAOS_RES *, int),
+TAOS *taos_connect_imp(const char *ip, const char *user, const char *pass, const char *db, uint16_t port, void (*fp)(void *, TAOS_RES *, int),
                        void *param, void **taos) {
   STscObj *pObj;
 
@@ -62,14 +62,26 @@ TAOS *taos_connect_imp(char *ip, char *user, char *pass, char *db, int port, voi
     }
   }
 
+#ifdef CLUSTER
+  if (ip && ip[0]) {
+    strcpy(tscMgmtIpList.ipstr[1], ip);
+    tscMgmtIpList.ip[1] = inet_addr(ip);
+  }
+#else
   if (ip && ip[0]) {
     if (ip != tsServerIpStr) {
       strcpy(tsServerIpStr, ip);
     }
     tsServerIp = inet_addr(ip);
   }
+#endif
 
   pObj = (STscObj *)malloc(sizeof(STscObj));
+  if (NULL == pObj) {
+    globalCode = TSDB_CODE_CLI_OUT_OF_MEMORY;
+    return NULL;
+  }
+  
   memset(pObj, 0, sizeof(STscObj));
   pObj->signature = pObj;
 
@@ -96,6 +108,12 @@ TAOS *taos_connect_imp(char *ip, char *user, char *pass, char *db, int port, voi
   pthread_mutex_init(&pObj->mutex, NULL);
 
   SSqlObj *pSql = (SSqlObj *)malloc(sizeof(SSqlObj));
+  if (NULL == pSql) {
+    globalCode = TSDB_CODE_CLI_OUT_OF_MEMORY;
+    free(pObj);
+    return NULL;
+  }
+  
   memset(pSql, 0, sizeof(SSqlObj));
   pSql->pTscObj = pObj;
   pSql->signature = pSql;
@@ -109,7 +127,13 @@ TAOS *taos_connect_imp(char *ip, char *user, char *pass, char *db, int port, voi
   }
 
   pSql->cmd.command = TSDB_SQL_CONNECT;
-  tscAllocPayloadWithSize(&pSql->cmd, TSDB_DEFAULT_PAYLOAD_SIZE);
+  int ret = tscAllocPayload(&pSql->cmd, TSDB_DEFAULT_PAYLOAD_SIZE);
+  if (TSDB_CODE_SUCCESS != ret) {
+    globalCode = TSDB_CODE_CLI_OUT_OF_MEMORY;
+    free(pSql);
+    free(pObj);
+    return NULL;
+  }
 
   pSql->res.code = tscProcessSql(pSql);
   if (fp != NULL) {
@@ -126,12 +150,14 @@ TAOS *taos_connect_imp(char *ip, char *user, char *pass, char *db, int port, voi
   return pObj;
 }
 
-TAOS *taos_connect(char *ip, char *user, char *pass, char *db, int port) {
+TAOS *taos_connect(const char *ip, const char *user, const char *pass, const char *db, uint16_t port) {
-  if (ip != NULL && (strcmp("127.0.0.1", ip) == 0 || strcasecmp("localhost", ip) == 0)) {
+  if (ip == NULL || (ip != NULL && (strcmp("127.0.0.1", ip) == 0 || strcasecmp("localhost", ip) == 0))) {
+#ifdef CLUSTER
+    ip = tsMasterIp;
+#else
     ip = tsServerIpStr;
+#endif
   }
-
-  if (ip == NULL) ip = tsServerIpStr;
   tscTrace("try to create a connection to %s", ip);
 
   void *taos = taos_connect_imp(ip, user, pass, db, port, NULL, NULL, NULL);
@@ -176,19 +202,19 @@ TAOS *taos_connect(char *ip, char *user, char *pass, char *db, int port) {
   return taos;
 }
 
-TAOS *taos_connect_a(char *ip, char *user, char *pass, char *db, int port, void (*fp)(void *, TAOS_RES *, int),
+TAOS *taos_connect_a(char *ip, char *user, char *pass, char *db, uint16_t port, void (*fp)(void *, TAOS_RES *, int),
                      void *param, void **taos) {
+#ifndef CLUSTER
   if (ip == NULL) {
     ip = tsServerIpStr;
   }
+#endif
   return taos_connect_imp(ip, user, pass, db, port, fp, param, taos);
 }
 
 void taos_close(TAOS *taos) {
   STscObj *pObj = (STscObj *)taos;
 
-  tscTrace("%p start to close connection, pSql:%p, HB:%p", pObj, pObj->pSql, pObj->pHb);
-
   if (pObj == NULL) return;
   if (pObj->signature != pObj) return;
 
@@ -199,37 +225,12 @@ void taos_close(TAOS *taos) {
   }
 }
 
-int taos_query(TAOS *taos, char *sqlstr) {
+int taos_query_imp(STscObj* pObj, SSqlObj* pSql) {
-  STscObj *pObj = (STscObj *)taos;
-  if (pObj == NULL || pObj->signature != pObj) {
-    globalCode = TSDB_CODE_DISCONNECTED;
-    return TSDB_CODE_DISCONNECTED;
-  }
-
-  SSqlObj *pSql = pObj->pSql;
   SSqlRes *pRes = &pSql->res;
 
   pRes->numOfRows = 1;
   pRes->numOfTotal = 0;
-
+  tscTrace("%p SQL: %s pObj:%p", pSql, pSql->sqlstr, pObj);
-  tscTrace("%p SQL: %s pObj:%p", pSql, sqlstr, pObj);
-
-  int32_t sqlLen = strlen(sqlstr);
-  if (sqlLen > TSDB_MAX_SQL_LEN) {
-    tscError("%p sql too long", pSql);
-    pRes->code = TSDB_CODE_INVALID_SQL;
-    return pRes->code;
-  }
-
-  pSql->sqlstr = realloc(pSql->sqlstr, sqlLen + 1);
-  if (pSql->sqlstr == NULL) {
-    pRes->code = TSDB_CODE_CLI_OUT_OF_MEMORY;
-    tscError("%p failed to malloc sql string buffer", pSql);
-    tscTrace("%p SQL result:%d, %s pObj:%p", pSql, pRes->code, taos_errstr(taos), pObj);
-    return pRes->code;
-  }
-
-  strtolower(pSql->sqlstr, sqlstr);
 
   pRes->code = (uint8_t)tsParseSql(pSql, pObj->acctId, pObj->db, false);
 
@@ -241,11 +242,16 @@ int taos_query(TAOS *taos, char *sqlstr) {
   pRes->qhandle = 0;
   pSql->thandle = NULL;
 
-  if (pRes->code != TSDB_CODE_SUCCESS) return pRes->code;
+  if (pRes->code == TSDB_CODE_SUCCESS) {
+    tscDoQuery(pSql);
+  }
 
-  tscDoQuery(pSql);
+  if (pRes->code == TSDB_CODE_SUCCESS) {
-
+    tscTrace("%p SQL result:%d, %s pObj:%p", pSql, pRes->code, taos_errstr(pObj), pObj);
-  tscTrace("%p SQL result:%d, %s pObj:%p", pSql, pRes->code, taos_errstr(taos), pObj);
+  } else {
+    tscError("%p SQL result:%d, %s pObj:%p", pSql, pRes->code, taos_errstr(pObj), pObj);
+  }
+  
   if (pRes->code != TSDB_CODE_SUCCESS) {
     tscFreeSqlObjPartial(pSql);
   }
@@ -253,6 +259,40 @@ int taos_query(TAOS *taos, char *sqlstr) {
   return pRes->code;
 }
 
+int taos_query(TAOS *taos, const char *sqlstr) {
+  STscObj *pObj = (STscObj *)taos;
+  if (pObj == NULL || pObj->signature != pObj) {
+    globalCode = TSDB_CODE_DISCONNECTED;
+    return TSDB_CODE_DISCONNECTED;
+  }
+
+  SSqlObj *pSql = pObj->pSql;
+  SSqlRes *pRes = &pSql->res;
+
+  size_t sqlLen = strlen(sqlstr);
+  if (sqlLen > TSDB_MAX_SQL_LEN) {
+    pRes->code = tscInvalidSQLErrMsg(pSql->cmd.payload, "sql too long", NULL);  // set the additional error msg for invalid sql
+    tscError("%p SQL result:%d, %s pObj:%p", pSql, pRes->code, taos_errstr(taos), pObj);
+    
+    return pRes->code;
+  }
+
+  taosNotePrintTsc(sqlstr);
+
+  void *sql = realloc(pSql->sqlstr, sqlLen + 1);
+  if (sql == NULL) {
+    pRes->code = TSDB_CODE_CLI_OUT_OF_MEMORY;
+    tscError("%p failed to malloc sql string buffer, reason:%s", pSql, strerror(errno));
+  
+    tscError("%p SQL result:%d, %s pObj:%p", pSql, pRes->code, taos_errstr(taos), pObj);
+    return pRes->code;
+  }
+
+  pSql->sqlstr = sql;
+  strtolower(pSql->sqlstr, sqlstr);
+  return taos_query_imp(pObj, pSql);
+}
+
 TAOS_RES *taos_use_result(TAOS *taos) {
   STscObj *pObj = (STscObj *)taos;
   if (pObj == NULL || pObj->signature != pObj) {
@@ -276,14 +316,16 @@ int taos_num_fields(TAOS_RES *res) {
   SSqlObj *pSql = (SSqlObj *)res;
   if (pSql == NULL || pSql->signature != pSql) return 0;
 
-  return pSql->cmd.fieldsInfo.numOfOutputCols;
+  SFieldInfo *pFieldsInfo = &pSql->cmd.fieldsInfo;
+
+  return (pFieldsInfo->numOfOutputCols - pFieldsInfo->numOfHiddenCols);
 }
 
 int taos_field_count(TAOS *taos) {
   STscObj *pObj = (STscObj *)taos;
   if (pObj == NULL || pObj->signature != pObj) return 0;
 
-  return pObj->pSql->cmd.fieldsInfo.numOfOutputCols;
+  return taos_num_fields(pObj->pSql);
 }
 
 int taos_affected_rows(TAOS *taos) {
@@ -308,9 +350,8 @@ int taos_retrieve(TAOS_RES *res) {
   if (pSql == NULL || pSql->signature != pSql) return 0;
   if (pRes->qhandle == 0) return 0;
 
-  pRes->row = 0;
+  tscResetForNextRetrieve(pRes);
-  pRes->numOfRows = 0;
+
-  pCmd->type = 0;
   if (pCmd->command < TSDB_SQL_LOCAL) {
     pCmd->command = (pCmd->command > TSDB_SQL_MGMT) ? TSDB_SQL_RETRIEVE : TSDB_SQL_FETCH;
   }
@@ -331,9 +372,7 @@ int taos_fetch_block_impl(TAOS_RES *res, TAOS_ROW *rows) {
   }
 
   // Retrieve new block
-  pRes->row = 0;
+  tscResetForNextRetrieve(pRes);
-  pRes->numOfRows = 0;
-  pCmd->type = 0;
   if (pCmd->command < TSDB_SQL_LOCAL) {
     pCmd->command = (pCmd->command > TSDB_SQL_MGMT) ? TSDB_SQL_RETRIEVE : TSDB_SQL_FETCH;
   }
@@ -359,38 +398,15 @@ int taos_fetch_block_impl(TAOS_RES *res, TAOS_ROW *rows) {
   return (pCmd->order.order == TSQL_SO_DESC) ? pRes->numOfRows : -pRes->numOfRows;
 }
 
-TAOS_ROW taos_fetch_row_impl(TAOS_RES *res) {
+static void **doSetResultRowData(SSqlObj *pSql) {
-  SSqlObj *pSql = (SSqlObj *)res;
   SSqlCmd *pCmd = &pSql->cmd;
   SSqlRes *pRes = &pSql->res;
-  STscObj *pObj = pSql->pTscObj;
-  int      wccount = 0;
 
-  if (pRes->qhandle == 0) return NULL;
+  int32_t num = 0;
-
-  if (pRes->row >= pRes->numOfRows) {
-    if (pObj->pSql != pSql) return NULL;
-
-    pRes->row = 0;
-    pRes->numOfRows = 0;
-    pCmd->type = 0;
-    if (pCmd->command < TSDB_SQL_LOCAL) {
-      pCmd->command = (pCmd->command > TSDB_SQL_MGMT) ? TSDB_SQL_RETRIEVE : TSDB_SQL_FETCH;
-    }
-
-    tscProcessSql(pSql);
-    if (pRes->numOfRows == 0) {
-      return NULL;
-    }
-
-    // secondary merge has handle this situation
-    if (pCmd->command != TSDB_SQL_RETRIEVE_METRIC) {
-      pRes->numOfTotal += pRes->numOfRows;
-    }
-  }
 
   for (int i = 0; i < pCmd->fieldsInfo.numOfOutputCols; ++i) {
     pRes->tsrow[i] = TSC_GET_RESPTR_BASE(pRes, pCmd, i, pCmd->order) + pRes->bytes[i] * pRes->row;
+
     // primary key column cannot be null in interval query, no need to check
     if (i == 0 && pCmd->nAggTimeInterval > 0) {
       continue;
@@ -401,34 +417,169 @@ TAOS_ROW taos_fetch_row_impl(TAOS_RES *res) {
     if (isNull(pRes->tsrow[i], pField->type)) {
       pRes->tsrow[i] = NULL;
     } else if (pField->type == TSDB_DATA_TYPE_NCHAR) {
-      /*
+      // convert unicode to native code in a temporary buffer extra one byte for terminated symbol
-       * convert unicode to native code in a temporary buffer extra one byte for terminated symbol
+      if (pRes->buffer[num] == NULL) {
-       */
+        pRes->buffer[num] = malloc(pField->bytes + 1);
-      if (pRes->buffer[wccount] == NULL) {
-        pRes->buffer[wccount] = (char *)calloc(1, pField->bytes + 1);
       } else {
-        pRes->buffer[wccount] = realloc(pRes->buffer[wccount], pField->bytes + 1);
+        pRes->buffer[num] = realloc(pRes->buffer[num], pField->bytes + 1);
       }
 
       /* string terminated */
-      memset(pRes->buffer[wccount], 0, pField->bytes);
+      memset(pRes->buffer[num], 0, pField->bytes + 1);
 
-      if (taosUcs4ToMbs(pRes->tsrow[i], pField->bytes, pRes->buffer[wccount])) {
+      if (taosUcs4ToMbs(pRes->tsrow[i], pField->bytes, pRes->buffer[num])) {
-        pRes->tsrow[i] = pRes->buffer[wccount];
+        pRes->tsrow[i] = pRes->buffer[num];
       } else {
         tscError("%p charset:%s to %s. val:%ls convert failed.", pSql, DEFAULT_UNICODE_ENCODEC, tsCharset, pRes->tsrow);
         pRes->tsrow[i] = NULL;
       }
-      wccount++;
+      num++;
     }
   }
 
-  assert(wccount <= pRes->numOfnchar);
+  assert(num <= pCmd->fieldsInfo.numOfOutputCols);
+
+  return pRes->tsrow;
+}
+
+static void **getOneRowFromBuf(SSqlObj *pSql) {
+  doSetResultRowData(pSql);
+
+  SSqlRes *pRes = &pSql->res;
   pRes->row++;
 
   return pRes->tsrow;
 }
 
+static void **tscJoinResultsetFromBuf(SSqlObj *pSql) {
+  SSqlCmd *pCmd = &pSql->cmd;
+  SSqlRes *pRes = &pSql->res;
+
+  while (1) {
+    bool hasData = true;
+
+    for (int32_t i = 0; i < pSql->numOfSubs; ++i) {
+      SSqlRes *pRes1 = &pSql->pSubs[i]->res;
+
+      // in case inner join, if any subquery exhausted, query completed
+      if (pRes1->numOfRows == 0) {
+        hasData = false;
+        break;
+      }
+    }
+
+    if (!hasData) {  // free all sub sqlobj
+      tscTrace("%p one subquery exhausted, free other %d subquery", pSql, pSql->numOfSubs - 1);
+
+      SSubqueryState *pState = NULL;
+
+      for (int32_t i = 0; i < pSql->numOfSubs; ++i) {
+        SSqlObj *               pChildObj = pSql->pSubs[i];
+        SJoinSubquerySupporter *pSupporter = (SJoinSubquerySupporter *)pChildObj->param;
+        pState = pSupporter->pState;
+
+        tscDestroyJoinSupporter(pChildObj->param);
+        taos_free_result(pChildObj);
+      }
+
+      free(pState);
+      return NULL;
+    }
+
+    if (pRes->tsrow == NULL) {
+      pRes->tsrow = malloc(sizeof(void *) * pCmd->exprsInfo.numOfExprs);
+    }
+
+    bool success = false;
+    if (pSql->numOfSubs >= 2) {
+      // do merge result
+      SSqlRes *pRes1 = &pSql->pSubs[0]->res;
+      SSqlRes *pRes2 = &pSql->pSubs[1]->res;
+
+      while (pRes1->row < pRes1->numOfRows && pRes2->row < pRes2->numOfRows) {
+        doSetResultRowData(pSql->pSubs[0]);
+        doSetResultRowData(pSql->pSubs[1]);
+
+        TSKEY key1 = *(TSKEY *)pRes1->tsrow[0];
+        TSKEY key2 = *(TSKEY *)pRes2->tsrow[0];
+
+        if (key1 == key2) {
+          success = true;
+          pRes1->row++;
+          pRes2->row++;
+          break;
+        } else if (key1 < key2) {
+          pRes1->row++;
+        } else if (key1 > key2) {
+          pRes2->row++;
+        }
+      }
+    } else {
+      SSqlRes *pRes1 = &pSql->pSubs[0]->res;
+      doSetResultRowData(pSql->pSubs[0]);
+
+      success = (pRes1->row++ < pRes1->numOfRows);
+    }
+
+    if (success) {
+      for (int32_t i = 0; i < pCmd->exprsInfo.numOfExprs; ++i) {
+        int32_t tableIndex = pRes->pColumnIndex[i].tableIndex;
+        int32_t columnIndex = pRes->pColumnIndex[i].columnIndex;
+
+        SSqlRes *pRes1 = &pSql->pSubs[tableIndex]->res;
+        pRes->tsrow[i] = pRes1->tsrow[columnIndex];
+      }
+
+      break;
+    } else {
+      tscFetchDatablockFromSubquery(pSql);
+      if (pRes->code != TSDB_CODE_SUCCESS) {
+        return NULL;
+      }
+    }
+  }
+
+  return pRes->tsrow;
+}
+
+TAOS_ROW taos_fetch_row_impl(TAOS_RES *res) {
+  SSqlObj *pSql = (SSqlObj *)res;
+  SSqlCmd *pCmd = &pSql->cmd;
+  SSqlRes *pRes = &pSql->res;
+
+  if (pRes->qhandle == 0 || pCmd->command == TSDB_SQL_RETRIEVE_EMPTY_RESULT) {
+    return NULL;
+  }
+
+  if (pCmd->command == TSDB_SQL_METRIC_JOIN_RETRIEVE) {
+    tscFetchDatablockFromSubquery(pSql);
+    if (pRes->code == TSDB_CODE_SUCCESS) {
+      return tscJoinResultsetFromBuf(pSql);
+    } else {
+      return NULL;
+    }
+
+  } else if (pRes->row >= pRes->numOfRows) {
+    tscResetForNextRetrieve(pRes);
+
+    if (pCmd->command < TSDB_SQL_LOCAL) {
+      pCmd->command = (pCmd->command > TSDB_SQL_MGMT) ? TSDB_SQL_RETRIEVE : TSDB_SQL_FETCH;
+    }
+
+    tscProcessSql(pSql);
+    if (pRes->numOfRows == 0) {
+      return NULL;
+    }
+
+    // local reducer has handle this situation
+    if (pCmd->command != TSDB_SQL_RETRIEVE_METRIC) {
+      pRes->numOfTotal += pRes->numOfRows;
+    }
+  }
+
+  return getOneRowFromBuf(pSql);
+}
+
 TAOS_ROW taos_fetch_row(TAOS_RES *res) {
   SSqlObj *pSql = (SSqlObj *)res;
   SSqlCmd *pCmd = &pSql->cmd;
@@ -441,8 +592,10 @@ TAOS_ROW taos_fetch_row(TAOS_RES *res) {
 
   // projection query on metric, pipeline retrieve data from vnode list, instead of two-stage merge
   TAOS_ROW rows = taos_fetch_row_impl(res);
-  while (rows == NULL && tscProjectionQueryOnMetric(pSql)) {
+  while (rows == NULL && tscProjectionQueryOnMetric(pCmd)) {
-    /* reach the maximum number of output rows, abort */
+    SMeterMetaInfo *pMeterMetaInfo = tscGetMeterMetaInfo(pCmd, 0);
+
+    // reach the maximum number of output rows, abort
     if (pCmd->globalLimit > 0 && pRes->numOfTotal >= pCmd->globalLimit) {
       return NULL;
     }
@@ -456,7 +609,7 @@ TAOS_ROW taos_fetch_row(TAOS_RES *res) {
 
     assert((pRes->offset >= 0 && pRes->numOfRows == 0) || (pRes->offset == 0 && pRes->numOfRows >= 0));
 
-    if ((++pCmd->vnodeIdx) <= pCmd->pMetricMeta->numOfVnodes) {
+    if ((++pCmd->vnodeIdx) < pMeterMetaInfo->pMetricMeta->numOfVnodes) {
       pCmd->command = TSDB_SQL_SELECT;
       assert(pSql->fp == NULL);
       tscProcessSql(pSql);
@@ -464,7 +617,7 @@ TAOS_ROW taos_fetch_row(TAOS_RES *res) {
     }
 
     // check!!!
-    if (rows != NULL || pCmd->vnodeIdx >= pCmd->pMetricMeta->numOfVnodes) {
+    if (rows != NULL || pCmd->vnodeIdx >= pMeterMetaInfo->pMetricMeta->numOfVnodes) {
       break;
     }
   }
@@ -485,20 +638,23 @@ int taos_fetch_block(TAOS_RES *res, TAOS_ROW *rows) {
     return 0;
   }
 
-  // projection query on metric, pipeline retrieve data from vnode list, instead
+  // projection query on metric, pipeline retrieve data from vnode list,
-  // of two-stage mergevnodeProcessMsgFromShell free qhandle
+  // instead of two-stage mergevnodeProcessMsgFromShell free qhandle
   nRows = taos_fetch_block_impl(res, rows);
-  while (*rows == NULL && tscProjectionQueryOnMetric(pSql)) {
+  while (*rows == NULL && tscProjectionQueryOnMetric(pCmd)) {
     /* reach the maximum number of output rows, abort */
     if (pCmd->globalLimit > 0 && pRes->numOfTotal >= pCmd->globalLimit) {
       return 0;
     }
 
+    SMeterMetaInfo *pMeterMetaInfo = tscGetMeterMetaInfo(pCmd, 0);
+
     /* update the limit value according to current retrieval results */
     pCmd->limit.limit = pSql->cmd.globalLimit - pRes->numOfTotal;
     pCmd->limit.offset = pRes->offset;
 
-    if ((++pSql->cmd.vnodeIdx) <= pSql->cmd.pMetricMeta->numOfVnodes) {
+
+    if ((++pSql->cmd.vnodeIdx) < pMeterMetaInfo->pMetricMeta->numOfVnodes) {
       pSql->cmd.command = TSDB_SQL_SELECT;
       assert(pSql->fp == NULL);
       tscProcessSql(pSql);
@@ -506,7 +662,7 @@ int taos_fetch_block(TAOS_RES *res, TAOS_ROW *rows) {
     }
 
     // check!!!
-    if (*rows != NULL || pCmd->vnodeIdx >= pCmd->pMetricMeta->numOfVnodes) {
+    if (*rows != NULL || pCmd->vnodeIdx >= pMeterMetaInfo->pMetricMeta->numOfVnodes) {
       break;
     }
   }
@@ -514,7 +670,7 @@ int taos_fetch_block(TAOS_RES *res, TAOS_ROW *rows) {
   return nRows;
 }
 
-int taos_select_db(TAOS *taos, char *db) {
+int taos_select_db(TAOS *taos, const char *db) {
   char sql[64];
 
   STscObj *pObj = (STscObj *)taos;
@@ -538,6 +694,7 @@ void taos_free_result(TAOS_RES *res) {
   tscTrace("%p start to free result", pSql);
 
   if (pSql->signature != pSql) return;
+
   if (pRes == NULL || pRes->qhandle == 0) {
     /* Query rsp is not received from vnode, so the qhandle is NULL */
     tscTrace("%p qhandle is null, abort free, fp:%p", pSql, pSql->fp);
@@ -551,52 +708,61 @@ void taos_free_result(TAOS_RES *res) {
     return;
   }
 
-  pCmd->type = 1;  // set freeFlag to 1 in retrieve message if there are
+  // set freeFlag to 1 in retrieve message if there are un-retrieved results
-                   // un-retrieved results
+  pCmd->type = TSDB_QUERY_TYPE_FREE_RESOURCE;
+
+  SMeterMetaInfo *pMeterMetaInfo = tscGetMeterMetaInfo(pCmd, 0);
 
   /*
-   * case 1. Partial data have been retrieved from vnodes, but not all data has been retrieved yet. We need to recycle
+   * case 1. Partial data have been retrieved from vnodes, but not all data has been retrieved yet.
-   *         the connection by noticing the vnode return 0 results.
+   *         We need to recycle the connection by noticing the vnode return 0 results.
    * case 2. When the query response is received from vnodes and the numOfRows is set to 0, the user calls
-   *         taos_free_result before the taos_fetch_row is called in non-stream computing, we need to recycle the
+   *         taos_free_result before the taos_fetch_row is called in non-stream computing,
-   *         connection.
+   *         we need to recycle the connection.
-   * case 3. If the query process is cancelled by user in stable query, tscProcessSql should not be called for each
+   * case 3. If the query process is cancelled by user in stable query, tscProcessSql should not be called
-   *         subquery. Because the failure of execution tsProcessSql may trigger the callback function
+   *         for each subquery. Because the failure of execution tsProcessSql may trigger the callback function
-   *         be executed, and the retry efforts may result in double free the
+   *         be executed, and the retry efforts may result in double free the resources, e.g.,SRetrieveSupport
-   * resources, e.g.,SRetrieveSupport
    */
   if (pRes->code != TSDB_CODE_QUERY_CANCELLED &&
       ((pRes->numOfRows > 0 && pCmd->command < TSDB_SQL_LOCAL) ||
        (pRes->code == TSDB_CODE_SUCCESS && pRes->numOfRows == 0 && pCmd->command == TSDB_SQL_SELECT &&
-        pSql->pStream == NULL && pCmd->pMeterMeta != NULL))) {
+        pSql->pStream == NULL && pMeterMetaInfo->pMeterMeta != NULL))) {
     pCmd->command = (pCmd->command > TSDB_SQL_MGMT) ? TSDB_SQL_RETRIEVE : TSDB_SQL_FETCH;
+
+    void *fp = pSql->fp;
+    if (fp != NULL) {
+      pSql->freed = 1;
+    }
+
     tscProcessSql(pSql);
 
-    if (pSql->fp) {
+    /*
-      pSql->freed = 1;
+     *  If release connection msg is sent to vnode, the corresponding SqlObj for async query can not be freed instantly,
-    } else {
+     *  since its free operation is delegated to callback function, which is tscProcessMsgFromServer.
-      pSql->thandle = NULL;
+     */
-
+    if (fp == NULL) {
       /*
-      * remove allocated resources and release metermeta/metricmeta references in cache
+       * fp may be released here, so we cannot use the pSql->fp
-      * since current query is completed
+       *
-      */
+       * In case of handle sync model query, the main SqlObj cannot be freed.
+       * So, we only free part attributes, including allocated resources and references on metermeta/metricmeta
+       * data in cache.
+       *
+       * Then this object will be reused and no free operation is required.
+       */
+      pSql->thandle = NULL;
       tscFreeSqlObjPartial(pSql);
       tscTrace("%p sql result is freed by app", pSql);
     }
   } else {
+    // if no free resource msg is sent to vnode, we free this object immediately.
+    pSql->thandle = NULL;
+
     if (pSql->fp) {
       assert(pRes->numOfRows == 0 || (pCmd->command > TSDB_SQL_LOCAL));
-      pSql->thandle = NULL;
       tscFreeSqlObj(pSql);
-      tscTrace("%p Async SqlObj is freed by app", pSql);
+      tscTrace("%p Async sql result is freed by app", pSql);
     } else {
-      pSql->thandle = NULL;
-
-      /*
-       * remove allocated resources and release metermeta/metricmeta references in cache
-       * since current query is completed
-       */
       tscFreeSqlObjPartial(pSql);
       tscTrace("%p sql result is freed", pSql);
     }
@@ -618,9 +784,9 @@ int taos_errno(TAOS *taos) {
 }
 
 char *taos_errstr(TAOS *taos) {
-  STscObj *     pObj = (STscObj *)taos;
+  STscObj *pObj = (STscObj *)taos;
-  unsigned char code;
+  uint8_t  code;
-  char          temp[256] = {0};
+//  char          temp[256] = {0};
 
   if (pObj == NULL || pObj->signature != pObj) return tsError[globalCode];
 
@@ -629,9 +795,10 @@ char *taos_errstr(TAOS *taos) {
   else
     code = pObj->pSql->res.code;
 
+  // for invalid sql, additional information is attached to explain why the sql is invalid
   if (code == TSDB_CODE_INVALID_SQL) {
-    snprintf(temp, tListLen(temp), "invalid SQL: %s", pObj->pSql->cmd.payload);
+//    snprintf(temp, tListLen(temp), "invalid SQL: %s", pObj->pSql->cmd.payload);
-    strcpy(pObj->pSql->cmd.payload, temp);
+//    strcpy(pObj->pSql->cmd.payload, temp);
     return pObj->pSql->cmd.payload;
   } else {
     return tsError[code];
@@ -662,7 +829,7 @@ void taos_stop_query(TAOS_RES *res) {
 
   pSql->res.code = TSDB_CODE_QUERY_CANCELLED;
 
-  if (tscIsTwoStageMergeMetricQuery(pSql)) {
+  if (tscIsTwoStageMergeMetricQuery(&pSql->cmd)) {
     tscKillMetricQuery(pSql);
     return;
   }
@@ -714,7 +881,7 @@ int taos_print_row(char *str, TAOS_ROW row, TAOS_FIELD *fields, int num_fields)
         break;
 
       case TSDB_DATA_TYPE_BINARY:
-      case TSDB_DATA_TYPE_NCHAR:{
+      case TSDB_DATA_TYPE_NCHAR: {
         /* limit the max length of string to no greater than the maximum length,
          * in case of not null-terminated string */
         size_t xlen = strlen(row[i]);
@@ -741,7 +908,7 @@ int taos_print_row(char *str, TAOS_ROW row, TAOS_FIELD *fields, int num_fields)
   return len;
 }
 
-int taos_validate_sql(TAOS *taos, char *sql) {
+int taos_validate_sql(TAOS *taos, const char *sql) {
   STscObj *pObj = (STscObj *)taos;
   if (pObj == NULL || pObj->signature != pObj) {
     globalCode = TSDB_CODE_DISCONNECTED;
@@ -781,3 +948,141 @@ int taos_validate_sql(TAOS *taos, char *sql) {
 
   return code;
 }
+
+static int tscParseTblNameList(SSqlObj *pSql, const char* tblNameList, int32_t tblListLen) {
+  // must before clean the sqlcmd object
+  tscRemoveAllMeterMetaInfo(&pSql->cmd, false);
+  tscCleanSqlCmd(&pSql->cmd);
+
+  SSqlCmd *pCmd = &pSql->cmd;
+
+  pCmd->command = TSDB_SQL_MULTI_META;
+  pCmd->count = 0;
+
+  int   code = TSDB_CODE_INVALID_METER_ID;
+  char *str = (char*) tblNameList;
+
+  SMeterMetaInfo *pMeterMetaInfo = tscAddEmptyMeterMetaInfo(pCmd);
+
+  if ((code = tscAllocPayload(pCmd, tblListLen+16)) != TSDB_CODE_SUCCESS) {
+    return code;
+  }
+
+  char *nextStr;
+  char  tblName[TSDB_METER_ID_LEN];
+  int   payloadLen = 0;
+  char *pMsg = pCmd->payload;
+  while (1) {
+    nextStr = strchr(str, ',');
+    if (nextStr == NULL) {
+      break;
+    }
+
+    memcpy(tblName, str, nextStr - str);
+    int32_t len = nextStr - str;
+    tblName[len] = '\0';
+
+    str = nextStr + 1;
+
+    strtrim(tblName);
+    len = (uint32_t)strlen(tblName);
+    
+    SSQLToken sToken = {.n = len, .type = TK_ID, .z = tblName};
+    tSQLGetToken(tblName, &sToken.type);
+
+    // Check if the table name available or not
+    if (tscValidateName(&sToken) != TSDB_CODE_SUCCESS) {
+      code = TSDB_CODE_INVALID_METER_ID;
+      sprintf(pCmd->payload, "table name is invalid");
+      return code;
+    }
+
+    if ((code = setMeterID(pSql, &sToken, 0)) != TSDB_CODE_SUCCESS) {
+      return code;
+    }
+
+    if (++pCmd->count > TSDB_MULTI_METERMETA_MAX_NUM) {
+      code = TSDB_CODE_INVALID_METER_ID;
+      sprintf(pCmd->payload, "tables over the max number");
+      return code;
+    }
+
+    if (payloadLen + strlen(pMeterMetaInfo->name) + 128 >= pCmd->allocSize) {
+      char *pNewMem = realloc(pCmd->payload, pCmd->allocSize + tblListLen);
+      if (pNewMem == NULL) {
+        code = TSDB_CODE_CLI_OUT_OF_MEMORY;
+        sprintf(pCmd->payload, "failed to allocate memory");
+        return code;
+      }
+
+      pCmd->payload = pNewMem;
+      pCmd->allocSize = pCmd->allocSize + tblListLen;
+      pMsg = pCmd->payload;
+    }
+
+    payloadLen += sprintf(pMsg + payloadLen, "%s,", pMeterMetaInfo->name);
+  }
+
+  *(pMsg + payloadLen) = '\0';
+  pCmd->payloadLen = payloadLen + 1;
+
+  return TSDB_CODE_SUCCESS;
+}
+
+int taos_load_table_info(TAOS *taos, const char *tableNameList) {
+  const int32_t MAX_TABLE_NAME_LENGTH = 12*1024*1024; // 12MB list
+
+  STscObj *pObj = (STscObj *)taos;
+  if (pObj == NULL || pObj->signature != pObj) {
+    globalCode = TSDB_CODE_DISCONNECTED;
+    return TSDB_CODE_DISCONNECTED;
+  }
+
+  SSqlObj *pSql = pObj->pSql;
+  SSqlRes *pRes = &pSql->res;
+
+  pRes->numOfTotal = 0;  // the number of getting table meta from server
+  pRes->code = 0;
+
+  assert(pSql->fp == NULL);
+  tscTrace("%p tableNameList: %s pObj:%p", pSql, tableNameList, pObj);
+
+  int32_t tblListLen = strlen(tableNameList);
+  if (tblListLen > MAX_TABLE_NAME_LENGTH) {
+    tscError("%p tableNameList too long, length:%d, maximum allowed:%d", pSql, tblListLen, MAX_TABLE_NAME_LENGTH);
+    pRes->code = TSDB_CODE_INVALID_SQL;
+    return pRes->code;
+  }
+
+  char* str = calloc(1, tblListLen + 1);
+  if (str == NULL) {
+    pRes->code = TSDB_CODE_CLI_OUT_OF_MEMORY;
+    tscError("%p failed to malloc sql string buffer", pSql);
+    return pRes->code;
+  }
+
+  strtolower(str, tableNameList);
+  pRes->code = (uint8_t) tscParseTblNameList(pSql, str, tblListLen);
+
+  /*
+   * set the qhandle to 0 before return in order to erase the qhandle value assigned in the previous successful query.
+   * If qhandle is NOT set 0, the function of taos_free_result() will send message to server by calling tscProcessSql()
+   * to free connection, which may cause segment fault, when the parse phrase is not even successfully executed.
+   */
+  pRes->qhandle = 0;
+  pSql->thandle = NULL;
+  free(str);
+
+  if (pRes->code != TSDB_CODE_SUCCESS) {
+    return pRes->code;
+  }
+
+  tscDoQuery(pSql);
+
+  tscTrace("%p load multi metermeta result:%d %s pObj:%p", pSql, pRes->code, taos_errstr(taos), pObj);
+  if (pRes->code != TSDB_CODE_SUCCESS) {
+    tscFreeSqlObjPartial(pSql);
+  }
+
+  return pRes->code;
+}

src/client/src/tscStream.c

@@ -13,12 +13,14 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
+#include "os.h"
 #include "tlog.h"
-#include "tsql.h"
+#include "tscSQLParser.h"
 #include "ttime.h"
 #include "ttimer.h"
 #include "tutil.h"
 
+#include "taosmsg.h"
 #include "tscUtil.h"
 #include "tsclient.h"
 
@@ -32,7 +34,7 @@ static void tscSetRetryTimer(SSqlStream *pStream, SSqlObj *pSql, int64_t timer);
 static bool isProjectStream(SSqlCmd *pCmd) {
   for (int32_t i = 0; i < pCmd->fieldsInfo.numOfOutputCols; ++i) {
     SSqlExpr *pExpr = tscSqlExprGet(pCmd, i);
-    if (pExpr->sqlFuncId != TSDB_FUNC_PRJ) {
+    if (pExpr->functionId != TSDB_FUNC_PRJ) {
       return false;
     }
   }
@@ -64,14 +66,15 @@ static void tscProcessStreamLaunchQuery(SSchedMsg *pMsg) {
 
   pSql->fp = tscProcessStreamQueryCallback;
   pSql->param = pStream;
+  SMeterMetaInfo *pMeterMetaInfo = tscGetMeterMetaInfo(&pSql->cmd, 0);
 
-  int code = tscGetMeterMeta(pSql, pSql->cmd.name);
+  int code = tscGetMeterMeta(pSql, pMeterMetaInfo->name, 0);
   pSql->res.code = code;
 
   if (code == TSDB_CODE_ACTION_IN_PROGRESS) return;
 
-  if (code == 0 && UTIL_METER_IS_METRIC(&pSql->cmd)) {
+  if (code == 0 && UTIL_METER_IS_METRIC(pMeterMetaInfo)) {
-    code = tscGetMetricMeta(pSql, pSql->cmd.name);
+    code = tscGetMetricMeta(pSql);
     pSql->res.code = code;
 
     if (code == TSDB_CODE_ACTION_IN_PROGRESS) return;
@@ -88,7 +91,7 @@ static void tscProcessStreamLaunchQuery(SSchedMsg *pMsg) {
     return;
   }
 
-  tscTrace("%p stream:%p start stream query on:%s", pSql, pStream, pSql->cmd.name);
+  tscTrace("%p stream:%p start stream query on:%s", pSql, pStream, pMeterMetaInfo->name);
   tscProcessSql(pStream->pSql);
 
   tscIncStreamExecutionCount(pStream);
@@ -102,6 +105,7 @@ static void tscProcessStreamTimer(void *handle, void *tmrId) {
 
   pStream->numOfRes = 0;  // reset the numOfRes.
   SSqlObj *pSql = pStream->pSql;
+  tscTrace("%p add into timer", pSql);
 
   if (isProjectStream(&pSql->cmd)) {
     /*
@@ -135,7 +139,9 @@ static void tscProcessStreamQueryCallback(void *param, TAOS_RES *tres, int numOf
     tscError("%p stream:%p, query data failed, code:%d, retry in %lldms", pStream->pSql, pStream, numOfRows,
              retryDelay);
 
-    tscClearSqlMetaInfoForce(&(pStream->pSql->cmd));
+    SMeterMetaInfo* pMeterMetaInfo = tscGetMeterMetaInfo(&pStream->pSql->cmd, 0);
+    tscClearMeterMetaInfo(pMeterMetaInfo, true);
+
     tscSetRetryTimer(pStream, pStream->pSql, retryDelay);
     return;
   }
@@ -143,7 +149,7 @@ static void tscProcessStreamQueryCallback(void *param, TAOS_RES *tres, int numOf
   taos_fetch_rows_a(tres, tscProcessStreamRetrieveResult, param);
 }
 
-static void tscSetTimestampForRes(SSqlStream *pStream, SSqlObj *pSql, int32_t numOfRows) {
+static void tscSetTimestampForRes(SSqlStream *pStream, SSqlObj *pSql) {
   SSqlRes *pRes = &pSql->res;
 
   int64_t  timestamp = *(int64_t *)pRes->data;
@@ -157,31 +163,29 @@ static void tscSetTimestampForRes(SSqlStream *pStream, SSqlObj *pSql, int32_t nu
 }
 
 static void tscProcessStreamRetrieveResult(void *param, TAOS_RES *res, int numOfRows) {
-  SSqlStream *pStream = (SSqlStream *)param;
+  SSqlStream *    pStream = (SSqlStream *)param;
-  SSqlObj *   pSql = (SSqlObj *)res;
+  SSqlObj *       pSql = (SSqlObj *)res;
+  SMeterMetaInfo *pMeterMetaInfo = tscGetMeterMetaInfo(&pSql->cmd, 0);
 
   if (pSql == NULL || numOfRows < 0) {
     int64_t retryDelayTime = tscGetRetryDelayTime(pStream->slidingTime, pStream->precision);
     tscError("%p stream:%p, retrieve data failed, code:%d, retry in %lldms", pSql, pStream, numOfRows, retryDelayTime);
-    tscClearSqlMetaInfoForce(&(pStream->pSql->cmd));
+    tscClearMeterMetaInfo(pMeterMetaInfo, true);
 
     tscSetRetryTimer(pStream, pStream->pSql, retryDelayTime);
     return;
   }
 
-  if (numOfRows > 0) {  // save
+  if (numOfRows > 0) { // when reaching here the first execution of stream computing is successful.
-    // when reaching here the first execution of stream computing is successful.
     pStream->numOfRes += numOfRows;
-    TAOS_ROW row = NULL;  //;
+
-    while ((row = taos_fetch_row(res)) != NULL) {
+    for(int32_t i = 0; i < numOfRows; ++i) {
-      //        char result[512] = {0};
+      TAOS_ROW row = taos_fetch_row(res);
-      //        taos_print_row(result, row, pSql->cmd.fieldsInfo.pFields, pSql->cmd.fieldsInfo.numOfOutputCols);
-      //        tscPrint("%p stream:%p query result: %s", pSql, pStream, result);
       tscTrace("%p stream:%p fetch result", pSql, pStream);
       if (isProjectStream(&pSql->cmd)) {
         pStream->stime = *(TSKEY *)row[0];
       } else {
-        tscSetTimestampForRes(pStream, pSql, numOfRows);
+        tscSetTimestampForRes(pStream, pSql);
       }
 
       // user callback function
@@ -214,7 +218,7 @@ static void tscProcessStreamRetrieveResult(void *param, TAOS_RES *res, int numOf
           row[i] = pSql->res.data + offset;
         }
 
-        tscSetTimestampForRes(pStream, pSql, numOfRows);
+        tscSetTimestampForRes(pStream, pSql);
         row[0] = pRes->data;
 
         //            char result[512] = {0};
@@ -243,11 +247,11 @@ static void tscProcessStreamRetrieveResult(void *param, TAOS_RES *res, int numOf
       }
     }
 
-    tscTrace("%p stream:%p, query on:%s, fetch result completed, fetched rows:%d.", pSql, pStream, pSql->cmd.name,
+    tscTrace("%p stream:%p, query on:%s, fetch result completed, fetched rows:%d", pSql, pStream, pMeterMetaInfo->name,
              pStream->numOfRes);
 
-    /* release the metric/meter meta information reference, so data in cache can be updated */
+    // release the metric/meter meta information reference, so data in cache can be updated
-    tscClearSqlMetaInfo(&(pSql->cmd));
+    tscClearMeterMetaInfo(pMeterMetaInfo, false);
     tscSetNextLaunchTimer(pStream, pSql);
   }
 }
@@ -351,7 +355,6 @@ static void tscSetSlidingWindowInfo(SSqlObj *pSql, SSqlStream *pStream) {
   if (pCmd->nAggTimeInterval < minIntervalTime) {
     tscWarn("%p stream:%p, original sample interval:%ld too small, reset to:%lld", pSql, pStream,
             pCmd->nAggTimeInterval, minIntervalTime);
-
     pCmd->nAggTimeInterval = minIntervalTime;
   }
 
@@ -447,7 +450,7 @@ static void setErrorInfo(STscObj* pObj, int32_t code, char* info) {
   strncpy(pCmd->payload, info, pCmd->payloadLen);
 }
 
-TAOS_STREAM *taos_open_stream(TAOS *taos, char *sqlstr, void (*fp)(void *param, TAOS_RES *, TAOS_ROW row),
+TAOS_STREAM *taos_open_stream(TAOS *taos, const char *sqlstr, void (*fp)(void *param, TAOS_RES *, TAOS_ROW row),
                               int64_t stime, void *param, void (*callback)(void *)) {
   STscObj *pObj = (STscObj *)taos;
   if (pObj == NULL || pObj->signature != pObj) return NULL;
@@ -462,7 +465,12 @@ TAOS_STREAM *taos_open_stream(TAOS *taos, char *sqlstr, void (*fp)(void *param,
   pSql->pTscObj = pObj;
   SSqlCmd *pCmd = &pSql->cmd;
   SSqlRes *pRes = &pSql->res;
-  tscAllocPayloadWithSize(pCmd, TSDB_DEFAULT_PAYLOAD_SIZE);
+  int ret = tscAllocPayload(pCmd, TSDB_DEFAULT_PAYLOAD_SIZE);
+  if (TSDB_CODE_SUCCESS != ret) {
+    setErrorInfo(pObj, ret, NULL);
+    free(pSql);
+    return NULL;
+  }
 
   pSql->sqlstr = strdup(sqlstr);
   if (pSql->sqlstr == NULL) {
@@ -479,10 +487,16 @@ TAOS_STREAM *taos_open_stream(TAOS *taos, char *sqlstr, void (*fp)(void *param,
   tSQLParse(&SQLInfo, pSql->sqlstr);
 
   tscCleanSqlCmd(&pSql->cmd);
-  tscAllocPayloadWithSize(&pSql->cmd, TSDB_DEFAULT_PAYLOAD_SIZE);
+  ret = tscAllocPayload(&pSql->cmd, TSDB_DEFAULT_PAYLOAD_SIZE);
-
+  if (TSDB_CODE_SUCCESS != ret) {
-  //todo refactor later
+    setErrorInfo(pObj, ret, NULL);
-  pSql->cmd.count = 1;
+    tscError("%p open stream failed, sql:%s, code:%d", pSql, sqlstr, TSDB_CODE_CLI_OUT_OF_MEMORY);
+    tscFreeSqlObj(pSql);
+    return NULL;
+  }
+  
+  // TODO later refactor use enum
+  pSql->cmd.count = 1;  // 1 means sql in stream, allowed the sliding clause.
   pRes->code = tscToSQLCmd(pSql, &SQLInfo);
   SQLInfoDestroy(&SQLInfo);
 
@@ -503,13 +517,16 @@ TAOS_STREAM *taos_open_stream(TAOS *taos, char *sqlstr, void (*fp)(void *param,
     return NULL;
   }
 
+  SMeterMetaInfo* pMeterMetaInfo = tscGetMeterMetaInfo(pCmd, 0);
+
   pStream->fp = fp;
   pStream->callback = callback;
   pStream->param = param;
   pStream->pSql = pSql;
-  pStream->ctime = taosGetTimestamp(pCmd->pMeterMeta->precision);
+  pStream->precision = pMeterMetaInfo->pMeterMeta->precision;
+
+  pStream->ctime = taosGetTimestamp(pStream->precision);
   pStream->etime = pCmd->etime;
-  pStream->precision = pCmd->pMeterMeta->precision;
 
   pSql->pStream = pStream;
   tscAddIntoStreamList(pStream);
@@ -521,7 +538,7 @@ TAOS_STREAM *taos_open_stream(TAOS *taos, char *sqlstr, void (*fp)(void *param,
   taosTmrReset(tscProcessStreamTimer, starttime, pStream, tscTmr, &pStream->pTimer);
 
   tscTrace("%p stream:%p is opened, query on:%s, interval:%lld, sliding:%lld, first launched in:%lld, sql:%s", pSql,
-           pStream, pSql->cmd.name, pStream->interval, pStream->slidingTime, starttime, sqlstr);
+           pStream, pMeterMetaInfo->name, pStream->interval, pStream->slidingTime, starttime, sqlstr);
 
   return pStream;
 }
@@ -529,7 +546,7 @@ TAOS_STREAM *taos_open_stream(TAOS *taos, char *sqlstr, void (*fp)(void *param,
 void taos_close_stream(TAOS_STREAM *handle) {
   SSqlStream *pStream = (SSqlStream *)handle;
 
-  SSqlObj *pSql = (SSqlObj *)__sync_val_compare_and_swap_64(&pStream->pSql, pStream->pSql, 0);
+  SSqlObj *pSql = (SSqlObj *)atomic_exchange_ptr(&pStream->pSql, 0);
   if (pSql == NULL) {
     return;
   }

src/client/src/tscSub.c

@@ -13,7 +13,7 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <signal.h>
+#include "os.h"
 
 #include "shash.h"
 #include "taos.h"
@@ -36,7 +36,7 @@ typedef struct {
   TAOS_RES * result;
 } SSub;
 
-TAOS_SUB *taos_subscribe(char *host, char *user, char *pass, char *db, char *name, int64_t time, int mseconds) {
+TAOS_SUB *taos_subscribe(const char *host, const char *user, const char *pass, const char *db, const char *name, int64_t time, int mseconds) {
   SSub *pSub;
 
   pSub = (SSub *)malloc(sizeof(SSub));

src/client/src/tscSyntaxtreefunction.c

@@ -13,49 +13,43 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <assert.h>
+#include "os.h"
-#include <stdint.h>
-#include <stdio.h>
-#include <stdlib.h>
 
 #include "tscSyntaxtreefunction.h"
-#include "tsql.h"
+#include "tscSQLParser.h"
 #include "ttypes.h"
 #include "tutil.h"
 
-#define ARRAY_LIST_OP(left, right, _left_type, _right_type, len1, len2, out, op, _res_type, _ord) \
+#define ARRAY_LIST_OP(left, right, _left_type, _right_type, len1, len2, out, op, _res_type, _ord)     \
-  {                                                                                               \
+  {                                                                                                   \
-    int32_t i = ((_ord) == TSQL_SO_ASC) ? 0 : MAX(len1, len2) - 1;                                \
+    int32_t i = ((_ord) == TSQL_SO_ASC) ? 0 : MAX(len1, len2) - 1;                                    \
-    int32_t step = ((_ord) == TSQL_SO_ASC) ? 1 : -1;                                              \
+    int32_t step = ((_ord) == TSQL_SO_ASC) ? 1 : -1;                                                  \
-                                                                                                  \
+                                                                                                      \
-    if ((len1) == (len2)) {                                                                       \
+    if ((len1) == (len2)) {                                                                           \
-      for (; i < (len2) && i >= 0; i += step) {                                                   \
+      for (; i < (len2) && i >= 0; i += step, (out) += step) {                                        \
-        if (isNull((char *)&(left)[i], _left_type) || isNull((char *)&(right)[i], _right_type)) { \
+        if (isNull((char *)&((left)[i]), _left_type) || isNull((char *)&((right)[i]), _right_type)) { \
-          setNull((char *)&(out)[i], _res_type, tDataTypeDesc[_res_type].nSize);                  \
+          setNull((char *)(out), _res_type, tDataTypeDesc[_res_type].nSize);                          \
-          continue;                                                                               \
+          continue;                                                                                   \
-        }                                                                                         \
+        }                                                                                             \
-        *(out) = (double)(left)[i] op(right)[i];                                                  \
+        *(out) = (double)(left)[i] op(right)[i];                                                      \
-        (out) += step;                                                                            \
+      }                                                                                               \
-      }                                                                                           \
+    } else if ((len1) == 1) {                                                                         \
-    } else if ((len1) == 1) {                                                                     \
+      for (; i >= 0 && i < (len2); i += step, (out) += step) {                                        \
-      for (; i >= 0 && i < (len2); i += step) {                                                   \
+        if (isNull((char *)(left), _left_type) || isNull((char *)&(right)[i], _right_type)) {         \
-        if (isNull((char *)&(left)[i], _left_type) || isNull((char *)&(right)[i], _right_type)) { \
+          setNull((char *)(out), _res_type, tDataTypeDesc[_res_type].nSize);                          \
-          setNull((char *)&(out)[i], _res_type, tDataTypeDesc[_res_type].nSize);                  \
+          continue;                                                                                   \
-          continue;                                                                               \
+        }                                                                                             \
-        }                                                                                         \
+        *(out) = (double)(left)[0] op(right)[i];                                                      \
-        *(out) = (double)pLeft[0] op(pRight)[i];                                                  \
+      }                                                                                               \
-        (out) += step;                                                                            \
+    } else if ((len2) == 1) {                                                                         \
-      }                                                                                           \
+      for (; i >= 0 && i < (len1); i += step, (out) += step) {                                        \
-    } else if ((len2) == 1) {                                                                     \
+        if (isNull((char *)&(left)[i], _left_type) || isNull((char *)(right), _right_type)) {         \
-      for (; i >= 0 && i < (len1); i += step) {                                                   \
+          setNull((char *)(out), _res_type, tDataTypeDesc[_res_type].nSize);                          \
-        if (isNull((char *)&(left)[i], _left_type) || isNull((char *)&(right)[i], _right_type)) { \
+          continue;                                                                                   \
-          setNull((char *)&(out)[i], _res_type, tDataTypeDesc[_res_type].nSize);                  \
+        }                                                                                             \
-          continue;                                                                               \
+        *(out) = (double)(left)[i] op(right)[0];                                                      \
-        }                                                                                         \
+      }                                                                                               \
-        *(out) = (double)(pLeft)[i] op(pRight)[0];                                                \
+    }                                                                                                 \
-        (out) += step;                                                                            \
-      }                                                                                           \
-    }                                                                                             \
   }
 
 #define ARRAY_LIST_OP_REM(left, right, _left_type, _right_type, len1, len2, out, op, _res_type, _ord) \
@@ -64,31 +58,28 @@
     int32_t step = (_ord == TSQL_SO_ASC) ? 1 : -1;                                                    \
                                                                                                       \
     if (len1 == (len2)) {                                                                             \
-      for (; i >= 0 && i < (len2); i += step) {                                                       \
+      for (; i >= 0 && i < (len2); i += step, (out) += step) {                                        \
-        if (isNull((char *)&left[i], _left_type) || isNull((char *)&right[i], _right_type)) {         \
+        if (isNull((char *)&(left[i]), _left_type) || isNull((char *)&(right[i]), _right_type)) {     \
-          setNull((char *)&out[i], _res_type, tDataTypeDesc[_res_type].nSize);                        \
+          setNull((char *)(out), _res_type, tDataTypeDesc[_res_type].nSize);                          \
           continue;                                                                                   \
         }                                                                                             \
-        *(out) = (double)pLeft[i] - ((int64_t)(((double)pLeft[i]) / pRight[i])) * pRight[i];          \
+        *(out) = (double)(left)[i] - ((int64_t)(((double)(left)[i]) / (right)[i])) * (right)[i];      \
-        (out) += step;                                                                                \
       }                                                                                               \
     } else if (len1 == 1) {                                                                           \
-      for (; i >= 0 && i < (len2); i += step) {                                                       \
+      for (; i >= 0 && i < (len2); i += step, (out) += step) {                                        \
-        if (isNull((char *)&left[i], _left_type) || isNull((char *)&right[i], _right_type)) {         \
+        if (isNull((char *)(left), _left_type) || isNull((char *)&((right)[i]), _right_type)) {       \
-          setNull((char *)&out[i], _res_type, tDataTypeDesc[_res_type].nSize);                        \
+          setNull((char *)(out), _res_type, tDataTypeDesc[_res_type].nSize);                          \
           continue;                                                                                   \
         }                                                                                             \
-        *(out) = (double)pLeft[0] - ((int64_t)(((double)pLeft[0]) / pRight[i])) * pRight[i];          \
+        *(out) = (double)(left)[0] - ((int64_t)(((double)(left)[0]) / (right)[i])) * (right)[i];      \
-        (out) += step;                                                                                \
       }                                                                                               \
     } else if ((len2) == 1) {                                                                         \
-      for (; i >= 0 && i < len1; i += step) {                                                         \
+      for (; i >= 0 && i < len1; i += step, (out) += step) {                                          \
-        if (isNull((char *)&left[i], _left_type) || isNull((char *)&right[i], _right_type)) {         \
+        if (isNull((char *)&((left)[i]), _left_type) || isNull((char *)(right), _right_type)) {       \
-          setNull((char *)&out[i], _res_type, tDataTypeDesc[_res_type].nSize);                        \
+          setNull((char *)(out), _res_type, tDataTypeDesc[_res_type].nSize);                          \
           continue;                                                                                   \
         }                                                                                             \
-        *(out) = (double)pLeft[i] - ((int64_t)(((double)pLeft[i]) / pRight[0])) * pRight[0];          \
+        *(out) = (double)(left)[i] - ((int64_t)(((double)(left)[i]) / (right)[0])) * (right)[0];      \
-        (out) += step;                                                                                \
       }                                                                                               \
     }                                                                                                 \
   }
@@ -121,33 +112,30 @@ void calc_fn_i32_i32_add(void *left, void *right, int32_t numLeft, int32_t numRi
   int32_t step = (order == TSQL_SO_ASC) ? 1 : -1;
 
   if (numLeft == numRight) {
-    for (; i >= 0 && i < numRight; i += step) {
+    for (; i >= 0 && i < numRight; i += step, pOutput += step) {
-      if (isNull((char *)&pLeft[i], TSDB_DATA_TYPE_INT) || isNull((char *)&pRight[i], TSDB_DATA_TYPE_INT)) {
+      if (isNull((char *)&(pLeft[i]), TSDB_DATA_TYPE_INT) || isNull((char *)&(pRight[i]), TSDB_DATA_TYPE_INT)) {
-        setNull((char *)&pOutput[i], TSDB_DATA_TYPE_DOUBLE, tDataTypeDesc[TSDB_DATA_TYPE_DOUBLE].nSize);
+        setNull((char *)(pOutput), TSDB_DATA_TYPE_DOUBLE, tDataTypeDesc[TSDB_DATA_TYPE_DOUBLE].nSize);
         continue;
       }
 
       *pOutput = (double)pLeft[i] + pRight[i];
-      pOutput += step;
     }
   } else if (numLeft == 1) {
-    for (; i >= 0 && i < numRight; ++i) {
+    for (; i >= 0 && i < numRight; i += step, pOutput += step) {
-      if (isNull((char *)&pLeft[i], TSDB_DATA_TYPE_INT) || isNull((char *)&pRight[i], TSDB_DATA_TYPE_INT)) {
+      if (isNull((char *)(pLeft), TSDB_DATA_TYPE_INT) || isNull((char *)&(pRight[i]), TSDB_DATA_TYPE_INT)) {
-        setNull((char *)&pOutput[i], TSDB_DATA_TYPE_DOUBLE, tDataTypeDesc[TSDB_DATA_TYPE_DOUBLE].nSize);
+        setNull((char *)pOutput, TSDB_DATA_TYPE_DOUBLE, tDataTypeDesc[TSDB_DATA_TYPE_DOUBLE].nSize);
         continue;
       }
 
       *pOutput = (double)pLeft[0] + pRight[i];
-      pOutput += step;
     }
   } else if (numRight == 1) {
-    for (; i >= 0 && i < numLeft; ++i) {
+    for (; i >= 0 && i < numLeft; i += step, pOutput += step) {
-      if (isNull((char *)&pLeft[i], TSDB_DATA_TYPE_INT) || isNull((char *)&pRight[i], TSDB_DATA_TYPE_INT)) {
+      if (isNull((char *)&(pLeft[i]), TSDB_DATA_TYPE_INT) || isNull((char *)(pRight), TSDB_DATA_TYPE_INT)) {
-        setNull((char *)&pOutput[i], TSDB_DATA_TYPE_DOUBLE, tDataTypeDesc[TSDB_DATA_TYPE_DOUBLE].nSize);
+        setNull((char *)pOutput, TSDB_DATA_TYPE_DOUBLE, tDataTypeDesc[TSDB_DATA_TYPE_DOUBLE].nSize);
         continue;
       }
       *pOutput = (double)pLeft[i] + pRight[0];
-      pOutput += step;
     }
   }
 }
@@ -322,31 +310,28 @@ void calc_fn_i32_i32_sub(void *left, void *right, int32_t numLeft, int32_t numRi
   int32_t step = (order == TSQL_SO_ASC) ? 1 : -1;
 
   if (numLeft == numRight) {
-    for (; i >= 0 && i < numRight; i += step) {
+    for (; i >= 0 && i < numRight; i += step, pOutput += step) {
-      if (isNull((char *)&pLeft[i], TSDB_DATA_TYPE_INT) || isNull((char *)&pRight[i], TSDB_DATA_TYPE_INT)) {
+      if (isNull((char *)&(pLeft[i]), TSDB_DATA_TYPE_INT) || isNull((char *)&(pRight[i]), TSDB_DATA_TYPE_INT)) {
-        setNull((char *)&pOutput[i], TSDB_DATA_TYPE_DOUBLE, tDataTypeDesc[TSDB_DATA_TYPE_DOUBLE].nSize);
+        setNull((char *)&(pOutput[i]), TSDB_DATA_TYPE_DOUBLE, tDataTypeDesc[TSDB_DATA_TYPE_DOUBLE].nSize);
         continue;
       }
       *pOutput = (double)pLeft[i] - pRight[i];
-      pOutput += step;
     }
   } else if (numLeft == 1) {
-    for (; i >= 0 && i < numRight; i += step) {
+    for (; i >= 0 && i < numRight; i += step, pOutput += step) {
-      if (isNull((char *)&pLeft[i], TSDB_DATA_TYPE_INT) || isNull((char *)&pRight[i], TSDB_DATA_TYPE_INT)) {
+      if (isNull((char *)(pLeft), TSDB_DATA_TYPE_INT) || isNull((char *)&(pRight[i]), TSDB_DATA_TYPE_INT)) {
-        setNull((char *)&pOutput[i], TSDB_DATA_TYPE_DOUBLE, tDataTypeDesc[TSDB_DATA_TYPE_DOUBLE].nSize);
+        setNull((char *)(pOutput), TSDB_DATA_TYPE_DOUBLE, tDataTypeDesc[TSDB_DATA_TYPE_DOUBLE].nSize);
         continue;
       }
       *pOutput = (double)pLeft[0] - pRight[i];
-      pOutput += step;
     }
   } else if (numRight == 1) {
-    for (; i >= 0 && i < numLeft; i += step) {
+    for (; i >= 0 && i < numLeft; i += step, pOutput += step) {
-      if (isNull((char *)&pLeft[i], TSDB_DATA_TYPE_INT) || isNull((char *)&pRight[i], TSDB_DATA_TYPE_INT)) {
+      if (isNull((char *)&pLeft[i], TSDB_DATA_TYPE_INT) || isNull((char *)(pRight), TSDB_DATA_TYPE_INT)) {
-        setNull((char *)&pOutput[i], TSDB_DATA_TYPE_DOUBLE, tDataTypeDesc[TSDB_DATA_TYPE_DOUBLE].nSize);
+        setNull((char *)(pOutput), TSDB_DATA_TYPE_DOUBLE, tDataTypeDesc[TSDB_DATA_TYPE_DOUBLE].nSize);
         continue;
       }
       *pOutput = (double)pLeft[i] - pRight[0];
-      pOutput += step;
     }
   }
 }
@@ -536,31 +521,30 @@ void calc_fn_i32_i32_multi(void *left, void *right, int32_t numLeft, int32_t num
   int32_t step = (order == TSQL_SO_ASC) ? 1 : -1;
 
   if (numLeft == numRight) {
-    for (; i >= 0 && i < numRight; i += step) {
+    for (; i >= 0 && i < numRight; i += step, pOutput += step) {
-      if (isNull((char *)&pLeft[i], TSDB_DATA_TYPE_INT) || isNull((char *)&pRight[i], TSDB_DATA_TYPE_INT)) {
+      if (isNull((char *)&(pLeft[i]), TSDB_DATA_TYPE_INT) || isNull((char *)&(pRight[i]), TSDB_DATA_TYPE_INT)) {
-        setNull((char *)&pOutput[i], TSDB_DATA_TYPE_DOUBLE, tDataTypeDesc[TSDB_DATA_TYPE_DOUBLE].nSize);
+        setNull((char *)(pOutput), TSDB_DATA_TYPE_DOUBLE, tDataTypeDesc[TSDB_DATA_TYPE_DOUBLE].nSize);
         continue;
       }
+
       *pOutput = (double)pLeft[i] * pRight[i];
-      pOutput += step;
     }
   } else if (numLeft == 1) {
-    for (; i >= 0 && i < numRight; i += step) {
+    for (; i >= 0 && i < numRight; i += step, pOutput += step) {
-      if (isNull((char *)&pLeft[i], TSDB_DATA_TYPE_INT) || isNull((char *)&pRight[i], TSDB_DATA_TYPE_INT)) {
+      if (isNull((char *)(pLeft), TSDB_DATA_TYPE_INT) || isNull((char *)&(pRight[i]), TSDB_DATA_TYPE_INT)) {
-        setNull((char *)&pOutput[i], TSDB_DATA_TYPE_DOUBLE, tDataTypeDesc[TSDB_DATA_TYPE_DOUBLE].nSize);
+        setNull((char *)pOutput, TSDB_DATA_TYPE_DOUBLE, tDataTypeDesc[TSDB_DATA_TYPE_DOUBLE].nSize);
         continue;
       }
+
       *pOutput = (double)pLeft[0] * pRight[i];
-      pOutput += step;
     }
   } else if (numRight == 1) {
-    for (; i >= 0 && i < numLeft; i += step) {
+    for (; i >= 0 && i < numLeft; i += step, pOutput += step) {
-      if (isNull((char *)&pLeft[i], TSDB_DATA_TYPE_INT) || isNull((char *)&pRight[i], TSDB_DATA_TYPE_INT)) {
+      if (isNull((char *)&(pLeft[i]), TSDB_DATA_TYPE_INT) || isNull((char *)(pRight), TSDB_DATA_TYPE_INT)) {
-        setNull((char *)&pOutput[i], TSDB_DATA_TYPE_DOUBLE, tDataTypeDesc[TSDB_DATA_TYPE_DOUBLE].nSize);
+        setNull((char *)pOutput, TSDB_DATA_TYPE_DOUBLE, tDataTypeDesc[TSDB_DATA_TYPE_DOUBLE].nSize);
         continue;
       }
       *pOutput = (double)pLeft[i] * pRight[0];
-      pOutput += step;
     }
   }
 }
@@ -735,31 +719,30 @@ void calc_fn_i32_i32_div(void *left, void *right, int32_t numLeft, int32_t numRi
   int32_t step = (order == TSQL_SO_ASC) ? 1 : -1;
 
   if (numLeft == numRight) {
-    for (; i >= 0 && i < numRight; i += step) {
+    for (; i >= 0 && i < numRight; i += step, pOutput += step) {
-      if (isNull((char *)&pLeft[i], TSDB_DATA_TYPE_INT) || isNull((char *)&pRight[i], TSDB_DATA_TYPE_INT)) {
+      if (isNull((char *)&(pLeft[i]), TSDB_DATA_TYPE_INT) || isNull((char *)&(pRight[i]), TSDB_DATA_TYPE_INT)) {
-        setNull((char *)&pOutput[i], TSDB_DATA_TYPE_DOUBLE, tDataTypeDesc[TSDB_DATA_TYPE_DOUBLE].nSize);
+        setNull((char *)(pOutput), TSDB_DATA_TYPE_DOUBLE, tDataTypeDesc[TSDB_DATA_TYPE_DOUBLE].nSize);
         continue;
       }
+
       *pOutput = (double)pLeft[i] / pRight[i];
-      pOutput += step;
     }
   } else if (numLeft == 1) {
-    for (; i >= 0 && i < numRight; i += step) {
+    for (; i >= 0 && i < numRight; i += step, pOutput += step) {
-      if (isNull((char *)&pLeft[i], TSDB_DATA_TYPE_INT) || isNull((char *)&pRight[i], TSDB_DATA_TYPE_INT)) {
+      if (isNull((char *)(pLeft), TSDB_DATA_TYPE_INT) || isNull((char *)&(pRight[i]), TSDB_DATA_TYPE_INT)) {
-        setNull((char *)&pOutput[i], TSDB_DATA_TYPE_DOUBLE, tDataTypeDesc[TSDB_DATA_TYPE_DOUBLE].nSize);
+        setNull((char *)pOutput, TSDB_DATA_TYPE_DOUBLE, tDataTypeDesc[TSDB_DATA_TYPE_DOUBLE].nSize);
         continue;
       }
+
       *pOutput = (double)pLeft[0] / pRight[i];
-      pOutput += step;
     }
   } else if (numRight == 1) {
-    for (; i >= 0 && i < numLeft; i += step) {
+    for (; i >= 0 && i < numLeft; i += step, pOutput += step) {
-      if (isNull((char *)&pLeft[i], TSDB_DATA_TYPE_INT) || isNull((char *)&pRight[i], TSDB_DATA_TYPE_INT)) {
+      if (isNull((char *)&(pLeft[i]), TSDB_DATA_TYPE_INT) || isNull((char *)(pRight), TSDB_DATA_TYPE_INT)) {
-        setNull((char *)&pOutput[i], TSDB_DATA_TYPE_DOUBLE, tDataTypeDesc[TSDB_DATA_TYPE_DOUBLE].nSize);
+        setNull((char *)pOutput, TSDB_DATA_TYPE_DOUBLE, tDataTypeDesc[TSDB_DATA_TYPE_DOUBLE].nSize);
         continue;
       }
       *pOutput = (double)pLeft[i] / pRight[0];
-      pOutput += step;
     }
   }
 }
@@ -950,32 +933,31 @@ void calc_fn_i32_i32_rem(void *left, void *right, int32_t numLeft, int32_t numRi
   int32_t step = (order == TSQL_SO_ASC) ? 1 : -1;
 
   if (numLeft == numRight) {
-    for (; i >= 0 && i < numRight; i += step) {
+    for (; i >= 0 && i < numRight; i += step, pOutput += step) {
-      if (isNull((char *)&pLeft[i], TSDB_DATA_TYPE_INT) || isNull((char *)&pRight[i], TSDB_DATA_TYPE_INT)) {
+      if (isNull((char *)&(pLeft[i]), TSDB_DATA_TYPE_INT) || isNull((char *)&(pRight[i]), TSDB_DATA_TYPE_INT)) {
-        setNull((char *)&pOutput[i], TSDB_DATA_TYPE_DOUBLE, tDataTypeDesc[TSDB_DATA_TYPE_DOUBLE].nSize);
+        setNull((char *)(pOutput), TSDB_DATA_TYPE_DOUBLE, tDataTypeDesc[TSDB_DATA_TYPE_DOUBLE].nSize);
         continue;
       }
 
       *pOutput = (double)pLeft[i] - ((int64_t)(((double)pLeft[i]) / pRight[i])) * pRight[i];
-      pOutput += step;
     }
   } else if (numLeft == 1) {
-    for (; i >= 0 && i < numRight; i += step) {
+    for (; i >= 0 && i < numRight; i += step, pOutput += step) {
-      if (isNull((char *)&pLeft[i], TSDB_DATA_TYPE_INT) || isNull((char *)&pRight[i], TSDB_DATA_TYPE_INT)) {
+      if (isNull((char *)(pLeft), TSDB_DATA_TYPE_INT) || isNull((char *)&(pRight[i]), TSDB_DATA_TYPE_INT)) {
-        setNull((char *)&pOutput[i], TSDB_DATA_TYPE_DOUBLE, tDataTypeDesc[TSDB_DATA_TYPE_DOUBLE].nSize);
+        setNull((char *)pOutput, TSDB_DATA_TYPE_DOUBLE, tDataTypeDesc[TSDB_DATA_TYPE_DOUBLE].nSize);
         continue;
       }
+
       *pOutput = (double)pLeft[0] - ((int64_t)(((double)pLeft[0]) / pRight[i])) * pRight[i];
-      pOutput += step;
     }
   } else if (numRight == 1) {
-    for (; i >= 0 && i < numLeft; i += step) {
+    for (; i >= 0 && i < numLeft; i += step, pOutput += step) {
-      if (isNull((char *)&pLeft[i], TSDB_DATA_TYPE_INT) || isNull((char *)&pRight[i], TSDB_DATA_TYPE_INT)) {
+      if (isNull((char *)&(pLeft[i]), TSDB_DATA_TYPE_INT) || isNull((char *)(pRight), TSDB_DATA_TYPE_INT)) {
-        setNull((char *)&pOutput[i], TSDB_DATA_TYPE_DOUBLE, tDataTypeDesc[TSDB_DATA_TYPE_DOUBLE].nSize);
+        setNull((char *)pOutput, TSDB_DATA_TYPE_DOUBLE, tDataTypeDesc[TSDB_DATA_TYPE_DOUBLE].nSize);
         continue;
       }
+
       *pOutput = (double)pLeft[i] - ((int64_t)(((double)pLeft[i]) / pRight[0])) * pRight[0];
-      pOutput += step;
     }
   }
 }
@@ -1009,31 +991,31 @@ void calc_fn_i32_d_rem(void *left, void *right, int32_t numLeft, int32_t numRigh
   int32_t step = (order == TSQL_SO_ASC) ? 1 : -1;
 
   if (numLeft == numRight) {
-    for (; i >= 0 && i < numRight; i += step) {
+    for (; i >= 0 && i < numRight; i += step, pOutput += step) {
-      if (isNull((char *)&pLeft[i], TSDB_DATA_TYPE_INT) || isNull((char *)&pRight[i], TSDB_DATA_TYPE_DOUBLE)) {
+      if (isNull((char *)&(pLeft[i]), TSDB_DATA_TYPE_INT) || isNull((char *)&(pRight[i]), TSDB_DATA_TYPE_INT)) {
-        setNull((char *)&pOutput[i], TSDB_DATA_TYPE_DOUBLE, tDataTypeDesc[TSDB_DATA_TYPE_DOUBLE].nSize);
+        setNull((char *)(pOutput), TSDB_DATA_TYPE_DOUBLE, tDataTypeDesc[TSDB_DATA_TYPE_DOUBLE].nSize);
         continue;
       }
+
       *pOutput = (double)pLeft[i] - ((int64_t)(((double)pLeft[i]) / pRight[i])) * pRight[i];
-      pOutput += step;
     }
   } else if (numLeft == 1) {
-    for (; i >= 0 && i < numRight; i += step) {
+    for (; i >= 0 && i < numRight; i += step, pOutput += step) {
-      if (isNull((char *)&pLeft[i], TSDB_DATA_TYPE_INT) || isNull((char *)&pRight[i], TSDB_DATA_TYPE_DOUBLE)) {
+      if (isNull((char *)(pLeft), TSDB_DATA_TYPE_INT) || isNull((char *)&(pRight[i]), TSDB_DATA_TYPE_INT)) {
-        setNull((char *)&pOutput[i], TSDB_DATA_TYPE_DOUBLE, tDataTypeDesc[TSDB_DATA_TYPE_DOUBLE].nSize);
+        setNull((char *)pOutput, TSDB_DATA_TYPE_DOUBLE, tDataTypeDesc[TSDB_DATA_TYPE_DOUBLE].nSize);
         continue;
       }
+
       *pOutput = (double)pLeft[0] - ((int64_t)(((double)pLeft[0]) / pRight[i])) * pRight[i];
-      pOutput += step;
     }
   } else if (numRight == 1) {
-    for (; i >= 0 && i < numLeft; i += step) {
+    for (; i >= 0 && i < numLeft; i += step, pOutput += step) {
-      if (isNull((char *)&pLeft[i], TSDB_DATA_TYPE_INT) || isNull((char *)&pRight[i], TSDB_DATA_TYPE_DOUBLE)) {
+      if (isNull((char *)&(pLeft[i]), TSDB_DATA_TYPE_INT) || isNull((char *)(pRight), TSDB_DATA_TYPE_INT)) {
-        setNull((char *)&pOutput[i], TSDB_DATA_TYPE_DOUBLE, tDataTypeDesc[TSDB_DATA_TYPE_DOUBLE].nSize);
+        setNull((char *)pOutput, TSDB_DATA_TYPE_DOUBLE, tDataTypeDesc[TSDB_DATA_TYPE_DOUBLE].nSize);
         continue;
       }
+
       *pOutput = (double)pLeft[i] - ((int64_t)(((double)pLeft[i]) / pRight[0])) * pRight[0];
-      pOutput += step;
     }
   }
 }
@@ -1192,98 +1174,63 @@ void calc_fn_d_d_rem(void *left, void *right, int32_t numLeft, int32_t numRight,
  * the following are two-dimensional array list of callback function .
  */
 _bi_consumer_fn_t add_function_arraylist[8][10] = {
-    /*NULL, bool, tinyint, smallint, int, bigint, float, double, timestamp,
+    /*NULL, bool, tinyint, smallint, int, bigint, float, double, timestamp, binary*/
-       binary*/
     {NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL},  // EMPTY,
     {NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL},  // TSDB_DATA_TYPE_BOOL,
-    {NULL, NULL, calc_fn_i8_i8_add, calc_fn_i8_i16_add, calc_fn_i8_i32_add, calc_fn_i8_i64_add, calc_fn_i8_f_add,
+    {NULL, NULL, calc_fn_i8_i8_add, calc_fn_i8_i16_add, calc_fn_i8_i32_add, calc_fn_i8_i64_add, calc_fn_i8_f_add, calc_fn_i8_d_add, NULL, NULL},  // TSDB_DATA_TYPE_TINYINT
-     calc_fn_i8_d_add, NULL, NULL},  // TSDB_DATA_TYPE_TINYINT
+    {NULL, NULL, calc_fn_i16_i8_add, calc_fn_i16_i16_add, calc_fn_i16_i32_add, calc_fn_i16_i64_add, calc_fn_i16_f_add, calc_fn_i16_d_add, NULL, NULL},  // TSDB_DATA_TYPE_SMALLINT
-    {NULL, NULL, calc_fn_i16_i8_add, calc_fn_i16_i16_add, calc_fn_i16_i32_add, calc_fn_i16_i64_add, calc_fn_i16_f_add,
+    {NULL, NULL, calc_fn_i32_i8_add, calc_fn_i32_i16_add, calc_fn_i32_i32_add, calc_fn_i32_i64_add, calc_fn_i32_f_add, calc_fn_i32_d_add, NULL, NULL},  // TSDB_DATA_TYPE_INT
-     calc_fn_i16_d_add, NULL, NULL},  // TSDB_DATA_TYPE_SMALLINT
+    {NULL, NULL, calc_fn_i64_i8_add, calc_fn_i64_i16_add, calc_fn_i64_i32_add, calc_fn_i64_i64_add, calc_fn_i64_f_add, calc_fn_i64_d_add, NULL, NULL},  // TSDB_DATA_TYPE_BIGINT
-    {NULL, NULL, calc_fn_i32_i8_add, calc_fn_i32_i16_add, calc_fn_i32_i32_add, calc_fn_i32_i64_add, calc_fn_i32_f_add,
+    {NULL, NULL, calc_fn_f_i8_add, calc_fn_f_i16_add, calc_fn_f_i32_add, calc_fn_f_i64_add, calc_fn_f_f_add, calc_fn_f_d_add, NULL, NULL},  // TSDB_DATA_TYPE_FLOAT
-     calc_fn_i32_d_add, NULL, NULL},  // TSDB_DATA_TYPE_INT
+    {NULL, NULL, calc_fn_d_i8_add, calc_fn_d_i16_add, calc_fn_d_i32_add, calc_fn_d_i64_add, calc_fn_d_f_add, calc_fn_d_d_add, NULL, NULL},  // TSDB_DATA_TYPE_DOUBLE
-    {NULL, NULL, calc_fn_i64_i8_add, calc_fn_i64_i16_add, calc_fn_i64_i32_add, calc_fn_i64_i64_add, calc_fn_i64_f_add,
-     calc_fn_i64_d_add, NULL, NULL},  // TSDB_DATA_TYPE_BIGINT
-    {NULL, NULL, calc_fn_f_i8_add, calc_fn_f_i16_add, calc_fn_f_i32_add, calc_fn_f_i64_add, calc_fn_f_f_add,
-     calc_fn_f_d_add, NULL, NULL},  // TSDB_DATA_TYPE_FLOAT
-    {NULL, NULL, calc_fn_d_i8_add, calc_fn_d_i16_add, calc_fn_d_i32_add, calc_fn_d_i64_add, calc_fn_d_f_add,
-     calc_fn_d_d_add, NULL, NULL},  // TSDB_DATA_TYPE_DOUBLE
 };
 
 _bi_consumer_fn_t sub_function_arraylist[8][10] = {
-    /*NULL, bool, tinyint, smallint, int, bigint, float, double, timestamp,
+    /*NULL, bool, tinyint, smallint, int, bigint, float, double, timestamp, binary*/
-       binary*/
     {NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL},  // EMPTY,
     {NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL},  // TSDB_DATA_TYPE_BOOL,
-    {NULL, NULL, calc_fn_i8_i8_sub, calc_fn_i8_i16_sub, calc_fn_i8_i32_sub, calc_fn_i8_i64_sub, calc_fn_i8_f_sub,
+    {NULL, NULL, calc_fn_i8_i8_sub, calc_fn_i8_i16_sub, calc_fn_i8_i32_sub, calc_fn_i8_i64_sub, calc_fn_i8_f_sub, calc_fn_i8_d_sub, NULL, NULL},  // TSDB_DATA_TYPE_TINYINT
-     calc_fn_i8_d_sub, NULL, NULL},  // TSDB_DATA_TYPE_TINYINT
+    {NULL, NULL, calc_fn_i16_i8_sub, calc_fn_i16_i16_sub, calc_fn_i16_i32_sub, calc_fn_i16_i64_sub, calc_fn_i16_f_sub, calc_fn_i16_d_sub, NULL, NULL},  // TSDB_DATA_TYPE_SMALLINT
-    {NULL, NULL, calc_fn_i16_i8_sub, calc_fn_i16_i16_sub, calc_fn_i16_i32_sub, calc_fn_i16_i64_sub, calc_fn_i16_f_sub,
+    {NULL, NULL, calc_fn_i32_i8_sub, calc_fn_i32_i16_sub, calc_fn_i32_i32_sub, calc_fn_i32_i64_sub, calc_fn_i32_f_sub, calc_fn_i32_d_sub, NULL, NULL},  // TSDB_DATA_TYPE_INT
-     calc_fn_i16_d_sub, NULL, NULL},  // TSDB_DATA_TYPE_SMALLINT
+    {NULL, NULL, calc_fn_i64_i8_sub, calc_fn_i64_i16_sub, calc_fn_i64_i32_sub, calc_fn_i64_i64_sub, calc_fn_i64_f_sub, calc_fn_i64_d_sub, NULL, NULL},  // TSDB_DATA_TYPE_BIGINT
-    {NULL, NULL, calc_fn_i32_i8_sub, calc_fn_i32_i16_sub, calc_fn_i32_i32_sub, calc_fn_i32_i64_sub, calc_fn_i32_f_sub,
+    {NULL, NULL, calc_fn_f_i8_sub, calc_fn_f_i16_sub, calc_fn_f_i32_sub, calc_fn_f_i64_sub, calc_fn_f_f_sub, calc_fn_f_d_sub, NULL, NULL},  // TSDB_DATA_TYPE_FLOAT
-     calc_fn_i32_d_sub, NULL, NULL},  // TSDB_DATA_TYPE_INT
+    {NULL, NULL, calc_fn_d_i8_sub, calc_fn_d_i16_sub, calc_fn_d_i32_sub, calc_fn_d_i64_sub, calc_fn_d_f_sub, calc_fn_d_d_sub, NULL, NULL},  // TSDB_DATA_TYPE_DOUBLE
-    {NULL, NULL, calc_fn_i64_i8_sub, calc_fn_i64_i16_sub, calc_fn_i64_i32_sub, calc_fn_i64_i64_sub, calc_fn_i64_f_sub,
-     calc_fn_i64_d_sub, NULL, NULL},  // TSDB_DATA_TYPE_BIGINT
-    {NULL, NULL, calc_fn_f_i8_sub, calc_fn_f_i16_sub, calc_fn_f_i32_sub, calc_fn_f_i64_sub, calc_fn_f_f_sub,
-     calc_fn_f_d_sub, NULL, NULL},  // TSDB_DATA_TYPE_FLOAT
-    {NULL, NULL, calc_fn_d_i8_sub, calc_fn_d_i16_sub, calc_fn_d_i32_sub, calc_fn_d_i64_sub, calc_fn_d_f_sub,
-     calc_fn_d_d_sub, NULL, NULL},  // TSDB_DATA_TYPE_DOUBLE
 };
 
 _bi_consumer_fn_t multi_function_arraylist[][10] = {
-    /*NULL, bool, tinyint, smallint, int, bigint, float, double, timestamp,
+    /*NULL, bool, tinyint, smallint, int, bigint, float, double, timestamp, binary*/
-       binary*/
     {NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL},  // EMPTY,
     {NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL},  // TSDB_DATA_TYPE_BOOL,
-    {NULL, NULL, calc_fn_i8_i8_multi, calc_fn_i8_i16_multi, calc_fn_i8_i32_multi, calc_fn_i8_i64_multi,
+    {NULL, NULL, calc_fn_i8_i8_multi, calc_fn_i8_i16_multi, calc_fn_i8_i32_multi, calc_fn_i8_i64_multi, calc_fn_i8_f_multi, calc_fn_i8_d_multi, NULL, NULL},  // TSDB_DATA_TYPE_TINYINT
-     calc_fn_i8_f_multi, calc_fn_i8_d_multi, NULL, NULL},  // TSDB_DATA_TYPE_TINYINT
+    {NULL, NULL, calc_fn_i16_i8_multi, calc_fn_i16_i16_multi, calc_fn_i16_i32_multi, calc_fn_i16_i64_multi, calc_fn_i16_f_multi, calc_fn_i16_d_multi, NULL, NULL},  // TSDB_DATA_TYPE_SMALLINT
-    {NULL, NULL, calc_fn_i16_i8_multi, calc_fn_i16_i16_multi, calc_fn_i16_i32_multi, calc_fn_i16_i64_multi,
+    {NULL, NULL, calc_fn_i32_i8_multi, calc_fn_i32_i16_multi, calc_fn_i32_i32_multi, calc_fn_i32_i64_multi, calc_fn_i32_f_multi, calc_fn_i32_d_multi, NULL, NULL},  // TSDB_DATA_TYPE_INT
-     calc_fn_i16_f_multi, calc_fn_i16_d_multi, NULL, NULL},  // TSDB_DATA_TYPE_SMALLINT
+    {NULL, NULL, calc_fn_i64_i8_multi, calc_fn_i64_i16_multi, calc_fn_i64_i32_multi, calc_fn_i64_i64_multi, calc_fn_i64_f_multi, calc_fn_i64_d_multi, NULL, NULL},  // TSDB_DATA_TYPE_BIGINT
-    {NULL, NULL, calc_fn_i32_i8_multi, calc_fn_i32_i16_multi, calc_fn_i32_i32_multi, calc_fn_i32_i64_multi,
+    {NULL, NULL, calc_fn_f_i8_multi, calc_fn_f_i16_multi, calc_fn_f_i32_multi, calc_fn_f_i64_multi, calc_fn_f_f_multi, calc_fn_f_d_multi, NULL, NULL},  // TSDB_DATA_TYPE_FLOAT
-     calc_fn_i32_f_multi, calc_fn_i32_d_multi, NULL, NULL},  // TSDB_DATA_TYPE_INT
+    {NULL, NULL, calc_fn_d_i8_multi, calc_fn_d_i16_multi, calc_fn_d_i32_multi, calc_fn_d_i64_multi, calc_fn_d_f_multi, calc_fn_d_d_multi, NULL, NULL},  // TSDB_DATA_TYPE_DOUBLE
-    {NULL, NULL, calc_fn_i64_i8_multi, calc_fn_i64_i16_multi, calc_fn_i64_i32_multi, calc_fn_i64_i64_multi,
-     calc_fn_i64_f_multi, calc_fn_i64_d_multi, NULL, NULL},  // TSDB_DATA_TYPE_BIGINT
-    {NULL, NULL, calc_fn_f_i8_multi, calc_fn_f_i16_multi, calc_fn_f_i32_multi, calc_fn_f_i64_multi, calc_fn_f_f_multi,
-     calc_fn_f_d_multi, NULL, NULL},  // TSDB_DATA_TYPE_FLOAT
-    {NULL, NULL, calc_fn_d_i8_multi, calc_fn_d_i16_multi, calc_fn_d_i32_multi, calc_fn_d_i64_multi, calc_fn_d_f_multi,
-     calc_fn_d_d_multi, NULL, NULL},  // TSDB_DATA_TYPE_DOUBLE
 };
 
 _bi_consumer_fn_t div_function_arraylist[8][10] = {
-    /*NULL, bool, tinyint, smallint, int, bigint, float, double, timestamp,
+    /*NULL, bool, tinyint, smallint, int, bigint, float, double, timestamp, binary*/
-       binary*/
     {NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL},  // EMPTY,
     {NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL},  // TSDB_DATA_TYPE_BOOL,
-    {NULL, NULL, calc_fn_i8_i8_div, calc_fn_i8_i16_div, calc_fn_i8_i32_div, calc_fn_i8_i64_div, calc_fn_i8_f_div,
+    {NULL, NULL, calc_fn_i8_i8_div, calc_fn_i8_i16_div, calc_fn_i8_i32_div, calc_fn_i8_i64_div, calc_fn_i8_f_div, calc_fn_i8_d_div, NULL, NULL},  // TSDB_DATA_TYPE_TINYINT
-     calc_fn_i8_d_div, NULL, NULL},  // TSDB_DATA_TYPE_TINYINT
+    {NULL, NULL, calc_fn_i16_i8_div, calc_fn_i16_i16_div, calc_fn_i16_i32_div, calc_fn_i16_i64_div, calc_fn_i16_f_div, calc_fn_i16_d_div, NULL, NULL},  // TSDB_DATA_TYPE_SMALLINT
-    {NULL, NULL, calc_fn_i16_i8_div, calc_fn_i16_i16_div, calc_fn_i16_i32_div, calc_fn_i16_i64_div, calc_fn_i16_f_div,
+    {NULL, NULL, calc_fn_i32_i8_div, calc_fn_i32_i16_div, calc_fn_i32_i32_div, calc_fn_i32_i64_div, calc_fn_i32_f_div, calc_fn_i32_d_div, NULL, NULL},  // TSDB_DATA_TYPE_INT
-     calc_fn_i16_d_div, NULL, NULL},  // TSDB_DATA_TYPE_SMALLINT
+    {NULL, NULL, calc_fn_i64_i8_div, calc_fn_i64_i16_div, calc_fn_i64_i32_div, calc_fn_i64_i64_div, calc_fn_i64_f_div, calc_fn_i64_d_div, NULL, NULL},  // TSDB_DATA_TYPE_BIGINT
-    {NULL, NULL, calc_fn_i32_i8_div, calc_fn_i32_i16_div, calc_fn_i32_i32_div, calc_fn_i32_i64_div, calc_fn_i32_f_div,
+    {NULL, NULL, calc_fn_f_i8_div, calc_fn_f_i16_div, calc_fn_f_i32_div, calc_fn_f_i64_div, calc_fn_f_f_div, calc_fn_f_d_div, NULL, NULL},  // TSDB_DATA_TYPE_FLOAT
-     calc_fn_i32_d_div, NULL, NULL},  // TSDB_DATA_TYPE_INT
+    {NULL, NULL, calc_fn_d_i8_div, calc_fn_d_i16_div, calc_fn_d_i32_div, calc_fn_d_i64_div, calc_fn_d_f_div, calc_fn_d_d_div, NULL, NULL},  // TSDB_DATA_TYPE_DOUBLE
-    {NULL, NULL, calc_fn_i64_i8_div, calc_fn_i64_i16_div, calc_fn_i64_i32_div, calc_fn_i64_i64_div, calc_fn_i64_f_div,
-     calc_fn_i64_d_div, NULL, NULL},  // TSDB_DATA_TYPE_BIGINT
-    {NULL, NULL, calc_fn_f_i8_div, calc_fn_f_i16_div, calc_fn_f_i32_div, calc_fn_f_i64_div, calc_fn_f_f_div,
-     calc_fn_f_d_div, NULL, NULL},  // TSDB_DATA_TYPE_FLOAT
-    {NULL, NULL, calc_fn_d_i8_div, calc_fn_d_i16_div, calc_fn_d_i32_div, calc_fn_d_i64_div, calc_fn_d_f_div,
-     calc_fn_d_d_div, NULL, NULL},  // TSDB_DATA_TYPE_DOUBLE
 };
 
 _bi_consumer_fn_t rem_function_arraylist[8][10] = {
-    /*NULL, bool, tinyint, smallint, int, bigint, float, double, timestamp,
+    /*NULL, bool, tinyint, smallint, int, bigint, float, double, timestamp, binary*/
-       binary*/
     {NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL},  // EMPTY,
     {NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL},  // TSDB_DATA_TYPE_BOOL,
-    {NULL, NULL, calc_fn_i8_i8_rem, calc_fn_i8_i16_rem, calc_fn_i8_i32_rem, calc_fn_i8_i64_rem, calc_fn_i8_f_rem,
+    {NULL, NULL, calc_fn_i8_i8_rem, calc_fn_i8_i16_rem, calc_fn_i8_i32_rem, calc_fn_i8_i64_rem, calc_fn_i8_f_rem, calc_fn_i8_d_rem, NULL, NULL},  // TSDB_DATA_TYPE_TINYINT
-     calc_fn_i8_d_rem, NULL, NULL},  // TSDB_DATA_TYPE_TINYINT
+    {NULL, NULL, calc_fn_i16_i8_rem, calc_fn_i16_i16_rem, calc_fn_i16_i32_rem, calc_fn_i16_i64_rem, calc_fn_i16_f_rem, calc_fn_i16_d_rem, NULL, NULL},  // TSDB_DATA_TYPE_SMALLINT
-    {NULL, NULL, calc_fn_i16_i8_rem, calc_fn_i16_i16_rem, calc_fn_i16_i32_rem, calc_fn_i16_i64_rem, calc_fn_i16_f_rem,
+    {NULL, NULL, calc_fn_i32_i8_rem, calc_fn_i32_i16_rem, calc_fn_i32_i32_rem, calc_fn_i32_i64_rem, calc_fn_i32_f_rem, calc_fn_i32_d_rem, NULL, NULL},  // TSDB_DATA_TYPE_INT
-     calc_fn_i16_d_rem, NULL, NULL},  // TSDB_DATA_TYPE_SMALLINT
+    {NULL, NULL, calc_fn_i64_i8_rem, calc_fn_i64_i16_rem, calc_fn_i64_i32_rem, calc_fn_i64_i64_rem, calc_fn_i64_f_rem, calc_fn_i64_d_rem, NULL, NULL},  // TSDB_DATA_TYPE_BIGINT
-    {NULL, NULL, calc_fn_i32_i8_rem, calc_fn_i32_i16_rem, calc_fn_i32_i32_rem, calc_fn_i32_i64_rem, calc_fn_i32_f_rem,
+    {NULL, NULL, calc_fn_f_i8_rem, calc_fn_f_i16_rem, calc_fn_f_i32_rem, calc_fn_f_i64_rem, calc_fn_f_f_rem, calc_fn_f_d_rem, NULL, NULL},  // TSDB_DATA_TYPE_FLOAT
-     calc_fn_i32_d_rem, NULL, NULL},  // TSDB_DATA_TYPE_INT
+    {NULL, NULL, calc_fn_d_i8_rem, calc_fn_d_i16_rem, calc_fn_d_i32_rem, calc_fn_d_i64_rem, calc_fn_d_f_rem, calc_fn_d_d_rem, NULL, NULL},  // TSDB_DATA_TYPE_DOUBLE
-    {NULL, NULL, calc_fn_i64_i8_rem, calc_fn_i64_i16_rem, calc_fn_i64_i32_rem, calc_fn_i64_i64_rem, calc_fn_i64_f_rem,
-     calc_fn_i64_d_rem, NULL, NULL},  // TSDB_DATA_TYPE_BIGINT
-    {NULL, NULL, calc_fn_f_i8_rem, calc_fn_f_i16_rem, calc_fn_f_i32_rem, calc_fn_f_i64_rem, calc_fn_f_f_rem,
-     calc_fn_f_d_rem, NULL, NULL},  // TSDB_DATA_TYPE_FLOAT
-    {NULL, NULL, calc_fn_d_i8_rem, calc_fn_d_i16_rem, calc_fn_d_i32_rem, calc_fn_d_i64_rem, calc_fn_d_f_rem,
-     calc_fn_d_d_rem, NULL, NULL},  // TSDB_DATA_TYPE_DOUBLE
 };
 
 ////////////////////////////////////////////////////////////////////////////////////////////////////////////

src/client/src/tscSystem.c

@@ -13,15 +13,6 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <locale.h>
-#include <pthread.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <sys/stat.h>
-#include <sys/types.h>
-#include <time.h>
-
 #include "os.h"
 #include "taosmsg.h"
 #include "tcache.h"
@@ -54,6 +45,10 @@ extern int            tscEmbedded;
 int                   tscNumOfThreads;
 static pthread_once_t tscinit = PTHREAD_ONCE_INIT;
 
+extern int  tsTscEnableRecordSql;
+extern int  tsNumOfLogLines;
+void taosInitNote(int numOfNoteLines, int maxNotes, char* lable);
+
 void tscCheckDiskUsage(void *para, void *unused) {
   taosGetDisk();
   taosTmrReset(tscCheckDiskUsage, 1000, NULL, tscTmr, &tscCheckDiskUsageTmr);
@@ -87,12 +82,32 @@ void taos_init_imp() {
 
     tsReadGlobalConfig();
     tsPrintGlobalConfig();
-    
 
     tscTrace("starting to initialize TAOS client ...");
     tscTrace("Local IP address is:%s", tsLocalIp);
   }
 
+  taosSetCoreDump();
+
+  if (tsTscEnableRecordSql != 0) {
+    taosInitNote(tsNumOfLogLines / 10, 1, (char*)"tsc_note");
+  }
+  
+#ifdef CLUSTER
+  tscMgmtIpList.numOfIps = 2;
+  strcpy(tscMgmtIpList.ipstr[0], tsMasterIp);
+  tscMgmtIpList.ip[0] = inet_addr(tsMasterIp);
+
+  strcpy(tscMgmtIpList.ipstr[1], tsMasterIp);
+  tscMgmtIpList.ip[1] = inet_addr(tsMasterIp);
+
+  if (tsSecondIp[0]) {
+    tscMgmtIpList.numOfIps = 3;
+    strcpy(tscMgmtIpList.ipstr[2], tsSecondIp);
+    tscMgmtIpList.ip[2] = inet_addr(tsSecondIp);
+  }
+#endif
+
   tscInitMsgs();
   slaveIndex = rand();
   int queueSize = tsMaxVnodeConnections + tsMaxMeterConnections + tsMaxMgmtConnections + tsMaxMgmtConnections;
@@ -106,6 +121,10 @@ void taos_init_imp() {
   if (tscNumOfThreads < 2) tscNumOfThreads = 2;
 
   tscQhandle = taosInitScheduler(queueSize, tscNumOfThreads, "tsc");
+  if (NULL == tscQhandle) {
+    tscError("failed to init scheduler");
+    return;
+  }
 
   memset(&rpcInit, 0, sizeof(rpcInit));
   rpcInit.localIp = tsLocalIp;
@@ -126,7 +145,14 @@ void taos_init_imp() {
     return;
   }
 
-  for (int i = 0; i < tscNumOfThreads; ++i) taosOpenRpcChann(pVnodeConn, i, rpcInit.sessionsPerChann);
+  for (int i = 0; i < tscNumOfThreads; ++i) {
+    int retVal = taosOpenRpcChann(pVnodeConn, i, rpcInit.sessionsPerChann);
+    if (0 != retVal) {
+      tError("TSC-vnode, failed to open rpc chann");
+      taosCloseRpc(pVnodeConn);
+      return;
+    }
+  }
 
   memset(&rpcInit, 0, sizeof(rpcInit));
   rpcInit.localIp = tsLocalIp;
@@ -148,10 +174,9 @@ void taos_init_imp() {
   }
 
   tscTmr = taosTmrInit(tsMaxMgmtConnections * 2, 200, 60000, "TSC");
-  if (tscEmbedded == 0) {
+  if(0 == tscEmbedded){
-    taosTmrReset(tscCheckDiskUsage, 10, NULL, tscTmr, &tscCheckDiskUsageTmr);
+    taosTmrReset(tscCheckDiskUsage, 10, NULL, tscTmr, &tscCheckDiskUsageTmr);      
   }
-  
   int64_t refreshTime = tsMetricMetaKeepTimer < tsMeterMetaKeepTimer ? tsMetricMetaKeepTimer : tsMeterMetaKeepTimer;
   refreshTime = refreshTime > 2 ? 2 : refreshTime;
   refreshTime = refreshTime < 1 ? 1 : refreshTime;
@@ -161,55 +186,51 @@ void taos_init_imp() {
   tscConnCache = taosOpenConnCache(tsMaxMeterConnections * 2, taosCloseRpcConn, tscTmr, tsShellActivityTimer * 1000);
 
   initialized = 1;
-  tscTrace("taos client is initialized successfully");
+  tscTrace("client is initialized successfully");
   tsInsertHeadSize = tsRpcHeadSize + sizeof(SShellSubmitMsg);
 }
 
 void taos_init() { pthread_once(&tscinit, taos_init_imp); }
 
-int taos_options(TSDB_OPTION option, const void *arg, ...) {
+static int taos_options_imp(TSDB_OPTION option, const char *pStr) {
-  char *         pStr = NULL;
+  SGlobalConfig *cfg = NULL;
-  SGlobalConfig *cfg_configDir = tsGetConfigOption("configDir");
-  SGlobalConfig *cfg_activetimer = tsGetConfigOption("shellActivityTimer");
-  SGlobalConfig *cfg_locale = tsGetConfigOption("locale");
-  SGlobalConfig *cfg_charset = tsGetConfigOption("charset");
-  SGlobalConfig *cfg_timezone = tsGetConfigOption("timezone");
-  SGlobalConfig *cfg_socket = tsGetConfigOption("sockettype");
 
   switch (option) {
     case TSDB_OPTION_CONFIGDIR:
-      pStr = (char *)arg;
+      cfg = tsGetConfigOption("configDir");
-      if (cfg_configDir && cfg_configDir->cfgStatus <= TSDB_CFG_CSTATUS_OPTION) {
+      if (cfg && cfg->cfgStatus <= TSDB_CFG_CSTATUS_OPTION) {
         strncpy(configDir, pStr, TSDB_FILENAME_LEN);
-        cfg_configDir->cfgStatus = TSDB_CFG_CSTATUS_OPTION;
+        cfg->cfgStatus = TSDB_CFG_CSTATUS_OPTION;
         tscPrint("set config file directory:%s", pStr);
       } else {
-        tscWarn("config option:%s, input value:%s, is configured by %s, use %s", cfg_configDir->option, pStr,
+        tscWarn("config option:%s, input value:%s, is configured by %s, use %s", cfg->option, pStr,
-                tsCfgStatusStr[cfg_configDir->cfgStatus], (char *)cfg_configDir->ptr);
+                tsCfgStatusStr[cfg->cfgStatus], (char *)cfg->ptr);
       }
       break;
+
     case TSDB_OPTION_SHELL_ACTIVITY_TIMER:
-      if (cfg_activetimer && cfg_activetimer->cfgStatus <= TSDB_CFG_CSTATUS_OPTION) {
+      cfg = tsGetConfigOption("shellActivityTimer");
-        tsShellActivityTimer = atoi((char *)arg);
+      if (cfg && cfg->cfgStatus <= TSDB_CFG_CSTATUS_OPTION) {
+        tsShellActivityTimer = atoi(pStr);
         if (tsShellActivityTimer < 1) tsShellActivityTimer = 1;
         if (tsShellActivityTimer > 3600) tsShellActivityTimer = 3600;
-        cfg_activetimer->cfgStatus = TSDB_CFG_CSTATUS_OPTION;
+        cfg->cfgStatus = TSDB_CFG_CSTATUS_OPTION;
         tscPrint("set shellActivityTimer:%d", tsShellActivityTimer);
       } else {
-        tscWarn("config option:%s, input value:%s, is configured by %s, use %d", cfg_activetimer->option, pStr,
+        tscWarn("config option:%s, input value:%s, is configured by %s, use %d", cfg->option, pStr,
-                tsCfgStatusStr[cfg_activetimer->cfgStatus], (int32_t *)cfg_activetimer->ptr);
+                tsCfgStatusStr[cfg->cfgStatus], (int32_t *)cfg->ptr);
       }
       break;
-    case TSDB_OPTION_LOCALE: {  // set locale
-      pStr = (char *)arg;
 
+    case TSDB_OPTION_LOCALE: {  // set locale
+      cfg = tsGetConfigOption("locale");
       size_t len = strlen(pStr);
       if (len == 0 || len > TSDB_LOCALE_LEN) {
         tscPrint("Invalid locale:%s, use default", pStr);
         return -1;
       }
 
-      if (cfg_locale && cfg_charset && cfg_locale->cfgStatus <= TSDB_CFG_CSTATUS_OPTION) {
+      if (cfg && cfg && cfg->cfgStatus <= TSDB_CFG_CSTATUS_OPTION) {
         char sep = '.';
 
         if (strlen(tsLocale) == 0) { // locale does not set yet
@@ -222,9 +243,8 @@ int taos_options(TSDB_OPTION option, const void *arg, ...) {
 
         if (locale != NULL) {
           tscPrint("locale set, prev locale:%s, new locale:%s", tsLocale, locale);
-          cfg_locale->cfgStatus = TSDB_CFG_CSTATUS_OPTION;
+          cfg->cfgStatus = TSDB_CFG_CSTATUS_OPTION;
-        } else {
+        } else { // set the user-specified localed failed, use default LC_CTYPE as current locale
-          /* set the user-specified localed failed, use default LC_CTYPE as current locale */
           locale = setlocale(LC_CTYPE, tsLocale);
           tscPrint("failed to set locale:%s, current locale:%s", pStr, tsLocale);
         }
@@ -245,7 +265,7 @@ int taos_options(TSDB_OPTION option, const void *arg, ...) {
             }
 
             strncpy(tsCharset, charset, tListLen(tsCharset));
-            cfg_charset->cfgStatus = TSDB_CFG_CSTATUS_OPTION;
+            cfg->cfgStatus = TSDB_CFG_CSTATUS_OPTION;
 
           } else {
             tscPrint("charset:%s is not valid in locale, charset remains:%s", charset, tsCharset);
@@ -256,23 +276,22 @@ int taos_options(TSDB_OPTION option, const void *arg, ...) {
           tscPrint("charset remains:%s", tsCharset);
         }
       } else {
-        tscWarn("config option:%s, input value:%s, is configured by %s, use %s", cfg_locale->option, pStr,
+        tscWarn("config option:%s, input value:%s, is configured by %s, use %s", cfg->option, pStr,
-                tsCfgStatusStr[cfg_locale->cfgStatus], (char *)cfg_locale->ptr);
+                tsCfgStatusStr[cfg->cfgStatus], (char *)cfg->ptr);
       }
       break;
     }
 
     case TSDB_OPTION_CHARSET: {
       /* set charset will override the value of charset, assigned during system locale changed */
-      pStr = (char *)arg;
+      cfg = tsGetConfigOption("charset");
-
       size_t len = strlen(pStr);
       if (len == 0 || len > TSDB_LOCALE_LEN) {
         tscPrint("failed to set charset:%s", pStr);
         return -1;
       }
 
-      if (cfg_charset && cfg_charset->cfgStatus <= TSDB_CFG_CSTATUS_OPTION) {
+      if (cfg && cfg->cfgStatus <= TSDB_CFG_CSTATUS_OPTION) {
         if (taosValidateEncodec(pStr)) {
           if (strlen(tsCharset) == 0) {
             tscPrint("charset is set:%s", pStr);
@@ -281,40 +300,41 @@ int taos_options(TSDB_OPTION option, const void *arg, ...) {
           }
 
           strncpy(tsCharset, pStr, tListLen(tsCharset));
-          cfg_charset->cfgStatus = TSDB_CFG_CSTATUS_OPTION;
+          cfg->cfgStatus = TSDB_CFG_CSTATUS_OPTION;
         } else {
           tscPrint("charset:%s not valid", pStr);
         }
       } else {
-        tscWarn("config option:%s, input value:%s, is configured by %s, use %s", cfg_charset->option, pStr,
+        tscWarn("config option:%s, input value:%s, is configured by %s, use %s", cfg->option, pStr,
-                tsCfgStatusStr[cfg_charset->cfgStatus], (char *)cfg_charset->ptr);
+                tsCfgStatusStr[cfg->cfgStatus], (char *)cfg->ptr);
       }
 
       break;
     }
 
     case TSDB_OPTION_TIMEZONE:
-      pStr = (char *)arg;
+      cfg = tsGetConfigOption("timezone");
-      if (cfg_timezone && cfg_timezone->cfgStatus <= TSDB_CFG_CSTATUS_OPTION) {
+      if (cfg && cfg->cfgStatus <= TSDB_CFG_CSTATUS_OPTION) {
         strcpy(tsTimezone, pStr);
         tsSetTimeZone();
-        cfg_timezone->cfgStatus = TSDB_CFG_CSTATUS_OPTION;
+        cfg->cfgStatus = TSDB_CFG_CSTATUS_OPTION;
         tscTrace("timezone set:%s, input:%s by taos_options", tsTimezone, pStr);
       } else {
-        tscWarn("config option:%s, input value:%s, is configured by %s, use %s", cfg_timezone->option, pStr,
+        tscWarn("config option:%s, input value:%s, is configured by %s, use %s", cfg->option, pStr,
-                tsCfgStatusStr[cfg_timezone->cfgStatus], (char *)cfg_timezone->ptr);
+                tsCfgStatusStr[cfg->cfgStatus], (char *)cfg->ptr);
       }
       break;
 
     case TSDB_OPTION_SOCKET_TYPE:
-      if (cfg_socket && cfg_socket->cfgStatus <= TSDB_CFG_CSTATUS_OPTION) {
+      cfg = tsGetConfigOption("sockettype");
-        if (strcasecmp(arg, TAOS_SOCKET_TYPE_NAME_UDP) != 0 && strcasecmp(arg, TAOS_SOCKET_TYPE_NAME_TCP) != 0) {
+      if (cfg && cfg->cfgStatus <= TSDB_CFG_CSTATUS_OPTION) {
+        if (strcasecmp(pStr, TAOS_SOCKET_TYPE_NAME_UDP) != 0 && strcasecmp(pStr, TAOS_SOCKET_TYPE_NAME_TCP) != 0) {
           tscError("only 'tcp' or 'udp' allowed for configuring the socket type");
           return -1;
         }
 
-        strncpy(tsSocketType, arg, tListLen(tsSocketType));
+        strncpy(tsSocketType, pStr, tListLen(tsSocketType));
-        cfg_socket->cfgStatus = TSDB_CFG_CSTATUS_OPTION;
+        cfg->cfgStatus = TSDB_CFG_CSTATUS_OPTION;
         tscPrint("socket type is set:%s", tsSocketType);
       }
       break;
@@ -326,3 +346,20 @@ int taos_options(TSDB_OPTION option, const void *arg, ...) {
 
   return 0;
 }
+
+
+int taos_options(TSDB_OPTION option, const void *arg, ...) {
+  static int32_t lock = 0;
+
+  for (int i = 1; atomic_val_compare_exchange_32(&lock, 0, 1) != 0; ++i) {
+    if (i % 1000 == 0) {
+      tscPrint("haven't acquire lock after spin %d times.", i);
+      sched_yield();
+    }
+  }
+
+  int ret = taos_options_imp(option, (const char*)arg);
+
+  atomic_store_32(&lock, 0);
+  return ret;
+}

src/connector/go/src/taosSql/rows.go

@@ -118,14 +118,15 @@ func (rows *taosSqlRows) ColumnTypeScanType(i int) reflect.Type {
 	return rows.rs.columns[i].scanType()
 }
 
-func (rows *taosSqlRows) Close() (err error) {
+func (rows *taosSqlRows) Close() error {
-	mc := rows.mc
+	if rows.mc != nil {
-	if mc == nil {
+		result := C.taos_use_result(rows.mc.taos)
-		return nil
+		if result != nil {
+			C.taos_free_result(result)
+		}
+		rows.mc = nil
 	}
-
+	return nil
-	rows.mc = nil
-	return err
 }
 
 func (rows *taosSqlRows) HasNextResultSet() (b bool) {

src/connector/go/src/taosSql/taosSqlCgo.go

@@ -29,46 +29,47 @@ import (
 	"unsafe"
 )
 
-func (mc *taosConn) taosConnect(ip, user, pass, db string, port int) (taos unsafe.Pointer, err error){
+func (mc *taosConn) taosConnect(ip, user, pass, db string, port int) (taos unsafe.Pointer, err error) {
 	cuser := C.CString(user)
 	cpass := C.CString(pass)
-	cip   := C.CString(ip)
+	cip := C.CString(ip)
-	cdb   := C.CString(db)
+	cdb := C.CString(db)
 	defer C.free(unsafe.Pointer(cip))
 	defer C.free(unsafe.Pointer(cuser))
 	defer C.free(unsafe.Pointer(cpass))
 	defer C.free(unsafe.Pointer(cdb))
 
-	taosObj := C.taos_connect(cip, cuser, cpass, cdb, (C.int)(port))
+	taosObj := C.taos_connect(cip, cuser, cpass, cdb, (C.ushort)(port))
-    if taosObj == nil {
+	if taosObj == nil {
-        return nil, errors.New("taos_connect() fail!")
+		return nil, errors.New("taos_connect() fail!")
-    }
+	}
 
-    return (unsafe.Pointer)(taosObj), nil
+	return (unsafe.Pointer)(taosObj), nil
-} 
+}
 
 func (mc *taosConn) taosQuery(sqlstr string) (int, error) {
-	taosLog.Printf("taosQuery() input sql:%s\n", sqlstr)
+	//taosLog.Printf("taosQuery() input sql:%s\n", sqlstr)
 
-    csqlstr   := C.CString(sqlstr)
+	csqlstr := C.CString(sqlstr)
 	defer C.free(unsafe.Pointer(csqlstr))
-    code := int(C.taos_query(mc.taos, csqlstr))
+	code := int(C.taos_query(mc.taos, csqlstr))
 
-    if 0 != code {
+	if 0 != code {
-    	mc.taos_error()
+		mc.taos_error()
-    	errStr := C.GoString(C.taos_errstr(mc.taos))
+		errStr := C.GoString(C.taos_errstr(mc.taos))
-    	taosLog.Println("taos_query() failed:", errStr)
+		taosLog.Println("taos_query() failed:", errStr)
-	    return 0, errors.New(errStr)
+		taosLog.Printf("taosQuery() input sql:%s\n", sqlstr)
-    }
+		return 0, errors.New(errStr)
+	}
 
-    // read result and save into mc struct
+	// read result and save into mc struct
-    num_fields := int(C.taos_field_count(mc.taos))
+	num_fields := int(C.taos_field_count(mc.taos))
-    if 0 == num_fields { // there are no select and show kinds of commands
+	if 0 == num_fields { // there are no select and show kinds of commands
-        mc.affectedRows = int(C.taos_affected_rows(mc.taos))
+		mc.affectedRows = int(C.taos_affected_rows(mc.taos))
-        mc.insertId     = 0
+		mc.insertId = 0
-    }
+	}
 
-    return num_fields, nil
+	return num_fields, nil
 }
 
 func (mc *taosConn) taos_close() {
@@ -76,8 +77,8 @@ func (mc *taosConn) taos_close() {
 }
 
 func (mc *taosConn) taos_error() {
-    // free local resouce: allocated memory/metric-meta refcnt
+	// free local resouce: allocated memory/metric-meta refcnt
-    //var pRes unsafe.Pointer
+	//var pRes unsafe.Pointer
-    pRes := C.taos_use_result(mc.taos)
+	pRes := C.taos_use_result(mc.taos)
-    C.taos_free_result(pRes)
+	C.taos_free_result(pRes)
 }

src/connector/go/src/taosSql/utils.go

@@ -12,15 +12,25 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
-
 package taosSql
 
+/*
+#cgo CFLAGS : -I/usr/include
+#include <stdlib.h>
+#cgo LDFLAGS: -L/usr/lib -ltaos
+void taosSetAllocMode(int mode, const char* path, _Bool autoDump);
+void taosDumpMemoryLeak();
+*/
+import "C"
+
+
 import (
 	"database/sql/driver"
 	"errors"
 	"fmt"
 	"sync/atomic"
 	"time"
+	"unsafe"
 )
 
 // Returns the bool value of the input.
@@ -398,3 +408,15 @@ func namedValueToValue(named []driver.NamedValue) ([]driver.Value, error) {
 }
 
 
+/******************************************************************************
+*                     Utils for C memory issues debugging                     *
+******************************************************************************/
+func SetAllocMode(mode int32, path string) {
+	cpath := C.CString(path)
+	defer C.free(unsafe.Pointer(cpath))
+	C.taosSetAllocMode(C.int(mode), cpath, false)
+}
+
+func DumpMemoryLeak() {
+	C.taosDumpMemoryLeak()
+}

src/connector/jdbc/src/main/java/com/taosdata/jdbc/TSDBDriver.java

@@ -273,6 +273,9 @@ public class TSDBDriver implements java.sql.Driver {
 		String user = "";
 		for (String queryStr : queryStrings) {
 			String[] kvPair = queryStr.trim().split("=");
+			if (kvPair.length < 2){
+				continue;
+			}
 			switch (kvPair[0].toLowerCase()) {
 				case PROPERTY_KEY_USER:
 					urlProps.setProperty(PROPERTY_KEY_USER, kvPair[1]);

src/connector/jdbc/src/main/java/com/taosdata/jdbc/TSDBError.java

@@ -69,7 +69,7 @@ public enum TSDBError {
     TSDB_CODE_INVALID_OPTION(45, "invalid option"),
     TSDB_CODE_NODE_OFFLINE(46, "node offline"),
     TSDB_CODE_SYNC_REQUIRED(47, "sync required"),
-    TSDB_CODE_NO_ENOUGH_PNODES(48, "more dnodes are needed"),
+    TSDB_CODE_NO_ENOUGH_DNODES(48, "more dnodes are needed"),
     TSDB_CODE_UNSYNCED(49, "node in unsynced state"),
     TSDB_CODE_TOO_SLOW(50, "too slow"),
     TSDB_CODE_OTHERS(51, "others"),

src/connector/jdbc/src/main/java/com/taosdata/jdbc/TSDBJNIConnector.java

@@ -134,7 +134,7 @@ public class TSDBJNIConnector {
             }
         }
 
-        // Try retrieving result set for the executed SQLusing the current connection pointer. If the executed
+        // Try retrieving result set for the executed SQL using the current connection pointer. If the executed
         // SQL is a DML/DDL which doesn't return a result set, then taosResultSetPointer should be 0L. Otherwise,
         // taosResultSetPointer should be a non-zero value.
         taosResultSetPointer = this.getResultSetImp(this.taos);

src/connector/jdbc/src/test/java/TestPreparedStatement.java

@@ -0,0 +1,29 @@
+import com.taosdata.jdbc.TSDBDriver;
+import com.taosdata.jdbc.TSDBPreparedStatement;
+
+import java.sql.*;
+import java.util.Properties;
+
+public class TestPreparedStatement {
+
+    public static void main(String[] args) {
+        try {
+            Class.forName("com.taosdata.jdbc.TSDBDriver");
+            Properties properties = new Properties();
+            properties.setProperty(TSDBDriver.PROPERTY_KEY_HOST, "192.168.1.117");
+            Connection connection = DriverManager.getConnection("jdbc:TAOS://192.168.1.117:0/?user=root&password=taosdata", properties);
+            String rawSql = "SELECT ts, c1 FROM (select c1, ts from db.tb1) SUB_QRY";
+//            String[] params = new String[]{"ts", "c1"};
+            PreparedStatement pstmt = (TSDBPreparedStatement) connection.prepareStatement(rawSql);
+            ResultSet resSet = pstmt.executeQuery();
+            while(resSet.next()) {
+                for (int i = 1; i <= resSet.getMetaData().getColumnCount(); i++) {
+                    System.out.printf("%d: %s\n", i, resSet.getString(i));
+                }
+            }
+
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+    }
+}

src/connector/jdbc/src/test/java/TestTSDBDatabaseMetaData.java

@@ -0,0 +1,29 @@
+import com.taosdata.jdbc.TSDBDriver;
+
+import java.sql.Connection;
+import java.sql.DatabaseMetaData;
+import java.sql.DriverManager;
+import java.sql.ResultSet;
+import java.util.Properties;
+
+public class TestTSDBDatabaseMetaData {
+
+    public static void main(String[] args) {
+        try {
+            Class.forName("com.taosdata.jdbc.TSDBDriver");
+            Properties properties = new Properties();
+            properties.setProperty(TSDBDriver.PROPERTY_KEY_HOST, "192.168.1.114");
+            Connection connection = DriverManager.getConnection("jdbc:TAOS://192.168.1.114:0/?user=root&password=taosdata", properties);
+            DatabaseMetaData dbMetaData = connection.getMetaData();
+            ResultSet resSet = dbMetaData.getCatalogs();
+            while(resSet.next()) {
+                for (int i = 1; i <= resSet.getMetaData().getColumnCount(); i++) {
+                    System.out.printf("dbMetaData.getCatalogs(%d) = %s\n", i, resSet.getString(i));
+                }
+            }
+
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+    }
+}

src/inc/lz4.h

@@ -75,6 +75,9 @@ extern "C" {
 *  LZ4LIB_API :
 *  Control library symbols visibility.
 */
+
+#include <stdint.h>
+
 #if defined(LZ4_DLL_EXPORT) && (LZ4_DLL_EXPORT==1)
 #  define LZ4LIB_API __declspec(dllexport)
 #elif defined(LZ4_DLL_IMPORT) && (LZ4_DLL_IMPORT==1)
@@ -392,9 +395,9 @@ typedef struct {
  *        it may change in a future version !
  */
 #define LZ4_STREAMSIZE_U64 ((1 << (LZ4_MEMORY_USAGE-3)) + 4)
-#define LZ4_STREAMSIZE     (LZ4_STREAMSIZE_U64 * sizeof(unsigned long long))
+#define LZ4_STREAMSIZE     (LZ4_STREAMSIZE_U64 * sizeof(uint64_t))
 union LZ4_stream_u {
-    unsigned long long table[LZ4_STREAMSIZE_U64];
+    uint64_t table[LZ4_STREAMSIZE_U64];
     LZ4_stream_t_internal internal_donotuse;
 } ;  /* previously typedef'd to LZ4_stream_t */
 
@@ -408,9 +411,9 @@ union LZ4_stream_u {
  *        and may change in a future version !
  */
 #define LZ4_STREAMDECODESIZE_U64  4
-#define LZ4_STREAMDECODESIZE     (LZ4_STREAMDECODESIZE_U64 * sizeof(unsigned long long))
+#define LZ4_STREAMDECODESIZE     (LZ4_STREAMDECODESIZE_U64 * sizeof(uint64_t))
 union LZ4_streamDecode_u {
-    unsigned long long table[LZ4_STREAMDECODESIZE_U64];
+    uint64_t table[LZ4_STREAMDECODESIZE_U64];
     LZ4_streamDecode_t_internal internal_donotuse;
 } ;   /* previously typedef'd to LZ4_streamDecode_t */
 

src/inc/sdb.h

@@ -23,10 +23,10 @@ extern "C" {
 #include "taosmsg.h"
 #include "tsdb.h"
 
-extern short    sdbPeerPort;
+extern uint16_t    tsMgmtMgmtPort;
-extern short    sdbSyncPort;
+extern uint16_t    tsMgmtSyncPort;
 extern int      sdbMaxNodes;
-extern int      sdbHbTimer;  // seconds
+extern int      tsMgmtPeerHBTimer;  // seconds
 extern char     sdbZone[];
 extern char     sdbMasterIp[];
 extern char     sdbPrivateIp[];
@@ -71,6 +71,40 @@ enum _sdbaction {
   SDB_MAX_ACTION_TYPES
 };
 
+#ifdef CLUSTER
+
+#define SDB_MAX_PEERS 4
+typedef struct {
+  uint32_t ip;
+  uint32_t publicIp;
+  char     ipstr[20];
+  char     zone[12];
+  char     role;
+  int64_t  createdTime;
+  uint64_t dbVersion;
+  int64_t  lostTime;
+  char     status;
+  char     numOfMnodes;
+  int      numOfDnodes;
+  char     updateEnd[1];
+
+  // internal
+  int   syncFd;
+  void *hbTimer;
+  void *thandle;
+  void *pSync;
+} SSdbPeer;
+
+SSdbPeer *sdbAddPeer(uint32_t ip, uint32_t publicIp, char role);
+
+void sdbUpdateIpList();
+
+extern SSdbPeer *sdbPeer[];
+#define sdbInited (sdbPeer[0])
+#define sdbStatus (sdbPeer[0]->status)
+
+#endif
+
 void *sdbOpenTable(int maxRows, int32_t maxRowSize, char *name, char keyType, char *directory,
                    void *(*appTool)(char, void *, char *, int, int *));